ciphermask

Commit Graph

Author	SHA1	Message	Date
Dan J Miller	81b3e6e925	Transaction updates methods return whole tx meta (#14147 ) * Transaction updates methods return whole tx meta * Fix unit test Co-authored-by: Dan Miller <danjm@pop-os.localdomain>	3 years ago
Frederik Bolding	5107f06afa	snaps-skunkworks@0.10.6 (#14070 ) * snaps-skunkworks@0.10.6 * iframe-execution-environment@0.4.2 Co-authored-by: Erik Marks <rekmarks@protonmail.com>	3 years ago
Erik Marks	680d30f095	snaps-skunkworks@0.10.2 (#13901 )	3 years ago
Shane	059d5d0488	Fixed firefox Snaps + add initial end-to-end tests (#13671 ) * Changed registryUrl for snaps only in firefox Fixed getPlatform to only be imported into metamask-controller in flask Removed snaps specific testrunner script and use run-all with a cli option * Fixed flakey tests * Removed unneeded await * Added delay * Fixed linting	3 years ago
Frederik Bolding	be17d8f3d9	snaps-skunkworks@0.10.6 (#14070 ) * snaps-skunkworks@0.10.6 * iframe-execution-environment@0.4.2 Co-authored-by: Erik Marks <rekmarks@protonmail.com>	3 years ago
Daniel	95f830438a	Add a new fiat onboarding option via MoonPay (#13934 )	3 years ago
Alex Donesky	8df8f81df7	Deprecate extensionizer for webextension-polyfill (#13960 ) * deprecate extensionizer for webextension-polyfill * fix tests * remove extensionizer * fix browser windows api calls * fix broken on firefox * fix getAcceptLanguages call * update more browser apis that are now promisified * remove unnecessary console error ignoring in e2e tests	3 years ago
Alex Donesky	e3ea4f2cd0	Fix issue where we show contract address as recipient when calling safe transfer method on erc721 or erc1155 contracts (#13535 ) * fix issue where we show contract address as recipient when calling safe transfer method on erc721 or erc1155 contracts * updates function name getTransactionData -> parseStandardTokenTransactionData, and adds documentation	3 years ago
Frederik Bolding	8b9b9af13f	Add native browser notification support for Snaps (#13613 ) * Initial native notification implementation * Simplify implementation * Implementation based on RateLimitController * Update controllers package * Add notification to permission list * Wire up correctly * Remove snap_notify from the exclusion list	3 years ago
Shane	bba8b214b9	Fixed error thrown for 712 errors (#14008 )	3 years ago
Shane	4c908d7413	Better 712 errors (#13939 ) * Added more info for EIP-712 schema errors * Changed EthereumProviderError to EthereumRpcError * Fixed error code to not be hardcoded for signTypedData	3 years ago
Brad Decker	116d6b0eb8	add asset_type to transactions (#13858 )	3 years ago
Erik Marks	a3355d9ca5	@metamask/controllers@26.0.0 (#13867 ) * @metamask/controllers@26.0.0	3 years ago
PeterYinusa	c07e477c13	E2e metrics (#13904 ) * remove metrics build * remove segment server from tests * enable cors * mock segment globally * metrics e2e test * running test builds * move file * destructuring	3 years ago
Erik Marks	118480280c	snaps-skunkworks@0.10.2 (#13901 )	3 years ago
ryanml	d7713a70ce	Revert "Update SRP representation" This reverts commit `c3feabf4de`.	3 years ago
Shane	1f55af3151	Fixed firefox Snaps + add initial end-to-end tests (#13671 ) * Changed registryUrl for snaps only in firefox Fixed getPlatform to only be imported into metamask-controller in flask Removed snaps specific testrunner script and use run-all with a cli option * Fixed flakey tests * Removed unneeded await * Added delay * Fixed linting	3 years ago
Shane	adce5c558d	Fixed serialization of error parameter for `rejectPendingApproval` across JSON-RPC (#13847 ) * Fixed serialization of error parameter for rejectPendingApproval across JSON-RPC * Fixed linting * Added serialize error to add-ethereum-chain	3 years ago
Olusegun Akintayo	e7bf63a6d6	Fixes an issue where metamask popup is not loading on eth_accounts (#13840 ) (first time). Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>	3 years ago
Olusegun Akintayo	e157d2b51f	Dev olu update swap approval transaction (#13641 ) * Draft methods to brak updateTransaction into smaller more targeted methods. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * This is a combination of 52 commits. normalize and validate tx params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Method to normalize tx and check if it's unapproved. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Move the methods to controllers/transactions/index.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Flesh out the methods to update transaction with custom notes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Test update gas fees Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> use lodash to remove undefined properties update swap transaction tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Updates transaction user settings. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Add Update Transaction Metrics Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Update transaction gas fees actions.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Update EIP 1559 Params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint Fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Documentations. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove metrics from this PR Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint fixes: Removed unused variables Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Update swap approval transaction Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> 1. updateSwapApprovalTransaction should have id as first parameter 2. updateSwapApprovalTransaction should not show loading indicator Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> update swap transaction. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove metrics code. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Add updateTransactionParams to actions.js updateXXX and return txData at the end of updateXXX method Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Fix swapApprovalTransaction update to use same return method as swap update Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Draft methods to brak updateTransaction into smaller more targeted methods. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> normalize and validate tx params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Method to normalize tx and check if it's unapproved. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Move the methods to controllers/transactions/index.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Flesh out the methods to update transaction with custom notes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Test update gas fees Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Update swap approval transaction Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> use lodash to remove undefined properties update swap transaction tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Add Update Transaction Metrics Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Update transaction gas fees actions.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Update EIP 1559 Params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint Fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Documentations. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove metrics from this PR Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint fixes: Removed unused variables Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Update swap approval transaction Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> 1. updateSwapApprovalTransaction should have id as first parameter 2. updateSwapApprovalTransaction should not show loading indicator Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> update swap transaction. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove metrics code. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Add updateTransactionParams to actions.js updateXXX and return txData at the end of updateXXX method Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Fix swapApprovalTransaction update to use same return method as swap update Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove duplicate tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove comments. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Do not hideLoading, since we're not showing it. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> ...approveTxMeta no longer needed here. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove estimated base fee from swap approval txs. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> remove txTradeMeta from params make sure rebase didn't mess up any code - first pass Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Lint fixes Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>	3 years ago
Erik Marks	259e30abc2	@metamask/controllers@26.0.0 (#13867 ) * @metamask/controllers@26.0.0	3 years ago
Jyoti Puri	9d26bd762f	Improvements in connectRemote function in background.js (#13762 )	3 years ago
Alex Donesky	3747ace06b	Refactor token send/method confirmation flow (trimmed down) (#13788 ) * make use of getTokenStandardAndDetails method exposed on assetsContractController to determine how to represent the contract being interacted with in token contract method calls	3 years ago
Niranjana Binoy	8c9efb2a1f	Increase the txHistoryLimit in the transaction controller to 60 (#13743 )	3 years ago
Niranjana Binoy	3f0fa89d8d	Deleting transactions from currentNetworkTxnList based on unique address along with nonce and chainId (#13669 )	3 years ago
Mark Stacey	c3feabf4de	Update SRP representation An array of integers is now used to represent the SRP in three cases: * In the import wallet flow, the UI uses it to pass the user-provided SRP to the background (which converts the array to a buffer). * In the create wallet flow, the UI uses it to retrieve the generated SRP from the background. * When persisting the wallet to state, the background uses it to serialize the SRP. Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com>	3 years ago
Olusegun Akintayo	442edc5a91	Update EIP1559 params. (#13652 ) * Draft methods to brak updateTransaction into smaller more targeted methods. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * normalize and validate tx params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Method to normalize tx and check if it's unapproved. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Move the methods to controllers/transactions/index.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Flesh out the methods to update transaction with custom notes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Test update gas fees Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update swap approval transaction Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * use lodash to remove undefined properties update swap transaction tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Updates transaction user settings. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Add Update Transaction Metrics Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update transaction gas fees actions.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update EIP 1559 Params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint Fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Documentations. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Remove metrics from this PR Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes: Removed unused variables Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Add more params to updateTransactionGasFees. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update eip1559 method to editableParams. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Fix Mocha tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * add gasPrice to updateEditableParams Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Remove duplicated Params in notes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * A few more tests to cover if transaction status is not unapproved transaction is passed more parameters than it requires. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update EIP1559 params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Remove metrics Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Add updateTransactionParams to actions.js updateXXX and return txData at the end of updateXXX method Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * change method name to update editable params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Editable params should pass in the txParams and not the full tx object Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Fix jest tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Do not hideLoading since we're not showing it. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Proper JSDOCs comments. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Remove gas settings from updateEditableParams since we already have a dedicated gas update method. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Fix duplicate codes from rebasing. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>	3 years ago
Brad Decker	9cea401022	extract determineTransactionType from tx controller (#13737 )	3 years ago
Niranjana Binoy	4bb3ba4aef	Adding new settings dropdown for Dark mode in Experimental tab (#13097 )	3 years ago
Olusegun Akintayo	7ecb37ddf2	Fixes an issue where metamask popup is not loading on eth_accounts (#13840 ) (first time). Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>	3 years ago
Daniel	d17d7f2d18	Set up STX controller state (#13843 ) * persist stx controller state * Pass STX controller state as the 3rd param * Trigger Build Co-authored-by: Dan Miller <danjm.com@gmail.com>	3 years ago
Daniel	3327c5c797	Set up STX controller state (#13843 ) * persist stx controller state * Pass STX controller state as the 3rd param * Trigger Build Co-authored-by: Dan Miller <danjm.com@gmail.com>	3 years ago
Daniel	e937d9c8e3	Small fixes for Swaps (#13732 ) * Fix: Insufficient number of substitutions for key "stxSuccessDescription" * Only calculate "approvalGas" if the "approvalNeeded" param is truthy in a quote * "Swap from" has to be set to enable "Review Swap", set a default token for "Swap from" * Fix: Unable to find value of key "undefined" for locale * Use array destructuring	3 years ago
Olusegun Akintayo	028850899e	Replace uses of updateTransaction (from the tx controller) with less powerful methods for each specific state transition (#13496 ) * Draft methods to brak updateTransaction into smaller more targeted methods. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * normalize and validate tx params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Method to normalize tx and check if it's unapproved. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Move the methods to controllers/transactions/index.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Flesh out the methods to update transaction with custom notes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * enforce that only the properties for the specific methid can be updated via the method. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Rename calls to check transaction status. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Test update gas fees Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Test update estimated base fee Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update swap approval transaction Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * use lodash to remove undefined properties update swap transaction tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Updates transaction user settings. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Remove commented log lines Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Add more parameters to updateSwapTransaction approvalTxId estimatedBaseFee Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Fix documentation for updateSwapTransaction Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Add Update Transaction Metrics Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update transaction gas fees actions.js Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update EIP 1559 Params. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint Fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Documentations. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Remove metrics from this PR Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Lint fixes: Removed unused variables Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Add more params to updateTransactionGasFees. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Update eip1559 method to editableParams. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * lint fixes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Fix Mocha tests Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * add gasPrice to updateEditableParams Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Remove duplicated Params in notes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * A few more tests to cover if transaction status is not unapproved transaction is passed more parameters than it requires. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>	3 years ago
Niranjana Binoy	19098f7d69	Increase the txHistoryLimit in the transaction controller to 60 (#13743 )	3 years ago
Daniel	730f977939	Small fixes for Swaps (#13732 ) * Fix: Insufficient number of substitutions for key "stxSuccessDescription" * Only calculate "approvalGas" if the "approvalNeeded" param is truthy in a quote * "Swap from" has to be set to enable "Review Swap", set a default token for "Swap from" * Fix: Unable to find value of key "undefined" for locale * Use array destructuring	3 years ago
Daniel	6dd141ebfd	Small fixes for Swaps (#13732 ) * Fix: Insufficient number of substitutions for key "stxSuccessDescription" * Only calculate "approvalGas" if the "approvalNeeded" param is truthy in a quote * "Swap from" has to be set to enable "Review Swap", set a default token for "Swap from" * Fix: Unable to find value of key "undefined" for locale * Use array destructuring	3 years ago
Brad Decker	6e34b70db3	add account_type and device_model to tx metrics (#13682 )	3 years ago
Alex Donesky	858c5c1201	fix registerOnboarding method to correctly access completedOnboarding state value (#13723 )	3 years ago
Niranjana Binoy	2bab7ada8f	Deleting transactions from currentNetworkTxnList based on unique address along with nonce and chainId (#13669 )	3 years ago
ryanml	5b96e3370e	Using correct metricsEvent arg (#13684 )	3 years ago
Daniel	2585f45bde	Add support for Smart Transactions (#12676 )	3 years ago
David Walsh	009c6e1455	Use hardware wallet constants when possible (#13634 )	3 years ago
Erik Marks	35ac762e10	Add Snaps via Flask (#13462 ) This PR adds `snaps` under Flask build flags to the extension. This branch is mostly equivalent to the current production version of Flask, excepting some bug fixes and tweaks. Closes #11626	3 years ago
Jyoti Puri	c0d03ea70a	Fix: advance defaults should never be used for swaps (#13617 )	3 years ago
Jyoti Puri	2b5b787ca9	Fix: advance defaults should never be used for swaps (#13617 )	3 years ago
Niranjana Binoy	b42e1f75fa	Include transactions from all networks in state logs (#13599 )	3 years ago
Alex Donesky	7223d4cd2c	fix opensea/autodetect setting dependency relation (#13575 )	3 years ago
Daniel	0dcc8d050f	Resolve a BigNumber issue (#13555 ) * Do not call `decimalToHex` for `minimumGasLimit`, which is already in hex * Add `0x` prefix when returning a gas estimate * Fix UTs Co-authored-by: Dan J Miller <danjm.com@gmail.com>	3 years ago
Daniel	8166d50578	Resolve a BigNumber issue (#13555 ) * Do not call `decimalToHex` for `minimumGasLimit`, which is already in hex * Add `0x` prefix when returning a gas estimate * Fix UTs Co-authored-by: Dan J Miller <danjm.com@gmail.com>	3 years ago

... 4 5 6 7 8 ...

3329 Commits (3af83f8f986eae201261b5ab3f9b6f4522fb46df)