Skip to content

Commit

Permalink
default to masking
Browse files Browse the repository at this point in the history
  • Loading branch information
@BitHighlander
BitHighlander committed Oct 14, 2024
1 parent 725e181 commit e1e522f
Show file tree
Hide file tree
Showing 8 changed files with 7,534 additions and 6,025 deletions.
46 changes: 29 additions & 17 deletions chrome-extension/public/injected.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(function () {
const TAG = ' | InjectedScript | ';
const VERSION = '1.0.11';
const VERSION = '1.0.17';
console.log('**** KeepKey Injection script ****:', VERSION);

// Prevent multiple injections
Expand Down Expand Up @@ -141,7 +141,7 @@
let wallet = {
network: 'mainnet',
isKeepKey: true,
isMetaMask: false,
isMetaMask: true,
isConnected: true,
request: ({ method, params }) => {
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -259,30 +259,42 @@
if (userOverrideSetting) {
if (typeof window.ethereum === 'undefined') {
console.log('Mounting window.ethereum');
Object.defineProperty(window, 'ethereum', {
value: proxyEthereum,
writable: false,
configurable: false,
});
try {
Object.defineProperty(window, 'ethereum', {
value: proxyEthereum,
writable: false,
configurable: false,
});
} catch (e) {
console.error('Failed to mount window.ethereum');
}
}
}

if (userOverrideSetting) {
if (typeof window.xfi === 'undefined') {
Object.defineProperty(window, 'xfi', {
value: proxyXfi,
writable: false,
configurable: false,
});
try {
Object.defineProperty(window, 'xfi', {
value: proxyXfi,
writable: false,
configurable: false,
});
} catch (e) {
console.error('Failed to mount xfi');
}
}
}

if (typeof window.keepkey === 'undefined') {
Object.defineProperty(window, 'keepkey', {
value: proxyKeepKey,
writable: false,
configurable: false,
});
try {
Object.defineProperty(window, 'keepkey', {
value: proxyKeepKey,
writable: false,
configurable: false,
});
} catch (e) {
console.error('Failed to mount keepkey');
}
}

console.log(tag, 'window.ethereum and window.keepkey have been mounted');
Expand Down
244 changes: 211 additions & 33 deletions chrome-extension/src/background/chains/ethereumHandler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,70 +205,246 @@ const handleWalletAddEthereumChain = async (params, KEEPKEY_WALLET) => {
const tag = TAG + ' | handleWalletAddEthereumChain | ';
console.log(tag, 'Switching Chain params: ', params);
if (!params || !params[0] || !params[0].chainId) throw new Error('Invalid chainId (Required)');
let chainId = 'eip155:' + convertHexToDecimalChainId(params[0].chainId);
chainId = sanitizeChainId(chainId);
console.log(tag, 'Switching Chain chainId: ', chainId);

let currentProvider = await web3ProviderStorage.getWeb3Provider();
const chainIdHex = params[0].chainId;
const chainIdDecimal = parseInt(chainIdHex, 16);
const chainId = chainIdDecimal.toString();
const networkId = 'eip155:' + chainIdDecimal;
console.log(tag, 'Switching Chain networkId: ', networkId);

if (params && params[0] && params[0].rpcUrls && params[0].rpcUrls[0]) {
let currentProvider: any = await web3ProviderStorage.getWeb3Provider();

if (params[0].rpcUrls && params[0].rpcUrls[0]) {
const name = params[0].chainName;
console.log(tag, 'Switching Chain name: ', name);
currentProvider = {
explorer: params[0].blockExplorerUrls[0],
explorerAddressLink: params[0].blockExplorerUrls[0] + '/address/',
explorerTxLink: params[0].blockExplorerUrls[0] + '/tx/',
networkId: `eip155:${parseInt(params[0].chainId, 16)}`,
chainId: sanitizeChainId(params[0].chainId),
caip: `eip155:${parseInt(params[0].chainId, 16)}/slip44:60`,
networkId: `eip155:${chainIdDecimal}`,
chainId: chainId,
caip: `eip155:${chainIdDecimal}/slip44:60`,
name: params[0].chainName,
type: 'evm',
identifier: params[0].chainName,
nativeCurrency: params[0].nativeCurrency,
symbol: params[0].nativeCurrency.symbol, // Native currency symbol
precision: params[0].nativeCurrency.decimals, // Currency precision
symbol: params[0].nativeCurrency.symbol,
precision: params[0].nativeCurrency.decimals,
providerUrl: params[0].rpcUrls[0],
providers: params[0].rpcUrls,
};
console.log('currentProvider', currentProvider);
console.log(tag, 'currentProvider', currentProvider);
} else {
let chainIdToFind = sanitizeChainId(params[0].chainId);
console.log(tag, 'Switching to network without loading provider!: networkId', networkId);

let chainFound = false;
chainIdToFind = parseInt(sanitizedChainId, 16).toString();

for (const key of Object.keys(EIP155_CHAINS)) {
if (EIP155_CHAINS[key].chainId === chainIdToFind) {
currentProvider = {
chainId: chainIdToFind,
caip: EIP155_CHAINS[key].caip,
name: EIP155_CHAINS[key].name,
providerUrl: EIP155_CHAINS[key].rpc,
};
chainFound = true;
break;

if (EIP155_CHAINS[networkId]) {
console.log(tag, 'Chain found in defaults');
currentProvider = {
chainId: chainId,
caip: EIP155_CHAINS[networkId].caip,
name: EIP155_CHAINS[networkId].name,
providerUrl: EIP155_CHAINS[networkId].rpc,
};
chainFound = true;
} else {
console.log(tag, 'Chain not found in defaults');
const nodeInfoResponse = await KEEPKEY_WALLET.pioneer.SearchNodesByNetworkId({ chainId });
const nodeInfo = nodeInfoResponse.data;
console.log(tag, 'nodeInfo', nodeInfo);
if (!nodeInfo[0] || !nodeInfo[0].service) throw new Error('Node not found! Unable to change networks!');

let allProviders = [];
for (let i = 0; i < nodeInfo.length; i++) {
allProviders = allProviders.concat(nodeInfo[i].network);
}

currentProvider = {
explorer: nodeInfo[0].infoURL,
explorerAddressLink: nodeInfo[0].infoURL + '/address/',
explorerTxLink: nodeInfo[0].infoURL + '/tx/',
chainId: chainId,
networkId: networkId,
symbol: nodeInfo[0].nativeCurrency.symbol,
name: nodeInfo[0].name,
icon: nodeInfo[0].image,
logo: nodeInfo[0].image,
image: nodeInfo[0].image,
type: nodeInfo[0].type.toLowerCase(),
caip: nodeInfo[0].caip,
rpc: nodeInfo[0].service,
providerUrl: nodeInfo[0].service,
providers: allProviders,
};
chainFound = true;
}

if (!chainFound) {
throw new Error(`Chain with chainId ${chainIdToFind} not found.`);
throw new Error(`Chain with chainId ${chainId} not found.`);
}
}

assetContextStorage.updateContext(currentProvider);
// Save the updated provider to storage
// @ts-ignore
await web3ProviderStorage.saveWeb3Provider(currentProvider);
if (currentProvider != null) {
await web3ProviderStorage.saveWeb3Provider(currentProvider);
} else {
throw Error('Failed to set provider! empty provider!');
}

console.log('changing context to ', currentProvider.caip);
console.log('Changing context to ', currentProvider.caip);
const result = await KEEPKEY_WALLET.setAssetContext(currentProvider);
console.log('result ', result);
console.log('Result ', result);
console.log('KEEPKEY_WALLET.assetContext ', KEEPKEY_WALLET.assetContext);
// Update context and notify changes

chrome.runtime.sendMessage({ type: 'PROVIDER_CHANGED', provider: currentProvider });
chrome.runtime.sendMessage({ type: 'ASSET_CONTEXT_UPDATED', assetContext: KEEPKEY_WALLET.assetContext });

return true;
};

// const handleWalletAddEthereumChain = async (params, KEEPKEY_WALLET) => {
// const tag = TAG + ' | handleWalletAddEthereumChain | ';
// console.log(tag, 'Switching Chain params: ', params);
// if (!params || !params[0] || !params[0].chainId) throw new Error('Invalid chainId (Required)');
// let chainId = params[0].chainId
// let networkId = 'eip155:' + convertHexToDecimalChainId(params[0].chainId);
// networkId = sanitizeChainId(networkId);
// console.log(tag, 'Switching Chain networkId: ', networkId);
//
// let currentProvider = await web3ProviderStorage.getWeb3Provider();
//
// if (params && params[0] && params[0].rpcUrls && params[0].rpcUrls[0]) {
// const name = params[0].chainName;
// console.log(tag, 'Switching Chain name: ', name);
// currentProvider = {
// explorer: params[0].blockExplorerUrls[0],
// explorerAddressLink: params[0].blockExplorerUrls[0] + '/address/',
// explorerTxLink: params[0].blockExplorerUrls[0] + '/tx/',
// networkId: `eip155:${parseInt(params[0].chainId, 16)}`,
// chainId: sanitizeChainId(params[0].chainId),
// caip: `eip155:${parseInt(params[0].chainId, 16)}/slip44:60`,
// name: params[0].chainName,
// type: 'evm',
// identifier: params[0].chainName,
// nativeCurrency: params[0].nativeCurrency,
// symbol: params[0].nativeCurrency.symbol, // Native currency symbol
// precision: params[0].nativeCurrency.decimals, // Currency precision
// providerUrl: params[0].rpcUrls[0],
// providers: params[0].rpcUrls,
// };
// console.log(tag,'currentProvider', currentProvider);
// } else {
// console.log(tag,'Switching to network without Loading provider!: networkId', networkId);
//
// if(EIP155_CHAINS[chainId]){
// console.log(tag,'Chain found in defaults')
// //@TODO test! if fail, get from Pioneer
// currentProvider = {
// chainId: chainIdToFind,
// caip: EIP155_CHAINS[key].caip,
// name: EIP155_CHAINS[key].name,
// providerUrl: EIP155_CHAINS[key].rpc,
// };
// chainFound = true;
// }else{
// //get from Pioneer
// console.log(tag,'Chain not found in defaults')
// /* Example Data
// [
// {
// _id: '642f357f5b5d79001316d6b9',
// name: 'avalanche-c-chain',
// type: 'EVM',
// tags: [
// 'KeepKeySupport',
// 'WalletConnectSupport',
// 'DappSupport',
// 'avalanche-c-chain',
// 'Avalanche',
// 'AVAX'
// ],
// image: 'https://pioneers.dev/coins/avalanche-c-chain.png',
// blockchain: 'avalanche-c-chain',
// symbol: 'AVAX',
// service: 'https://api.avax.network/ext/bc/C/rpc',
// chainId: 43114,
// network: [ 'https://api.avax.network/ext/bc/C/rpc' ],
// facts: [ [Object] ],
// infoURL: 'https://www.avax.network/',
// shortName: 'Avalanche',
// nativeCurrency: { name: 'Avalanche', symbol: 'AVAX', decimals: 18 },
// faucets: [ 'https://free-online-app.com/faucet-for-eth-evm-chains/' ],
// caip: 'eip155:43114/slip44:60',
// isOffline: true
// } .... more nodes
// ]
//
// */
// let nodeInfo = await KEEPKEY_WALLET.pioneer.SearchNodesByNetworkId({chainId:"43114"})
// nodeInfo = nodeInfo.data
// console.log(tag,'nodeInfo', nodeInfo);
// if(!nodeInfo[0]) throw Error('Node not found! unable to change networks!')
// if(!nodeInfo[0].service) throw Error('Node not found! unable to change networks!')
//
// let allProviders = []
// for(let i = 0; i < nodeInfo.length; i++){
// allProviders.concat(nodeInfo[i].network)
// }
//
// currentProvider = {
// explorer:nodeInfo[0].infoURL,
// chainId,
// networkId,
// symbol: nodeInfo[0].nativeCurrency.symbol,
// name: nodeInfo[0].name,
// icon: nodeInfo[0].image,
// logo: nodeInfo[0].image,
// image: nodeInfo[0].image,
// type: nodeInfo[0].type,
// caip: nodeInfo[0].caip,
// rpc: nodeInfo[0].service,
// providerUrl: nodeInfo[0].service,
// providers: allProviders,
// };
// /*
// explorer: params[0].blockExplorerUrls[0],
// explorerAddressLink: params[0].blockExplorerUrls[0] + '/address/',
// explorerTxLink: params[0].blockExplorerUrls[0] + '/tx/',
// networkId: `eip155:${parseInt(params[0].chainId, 16)}`,
// chainId: sanitizeChainId(params[0].chainId),
// caip: `eip155:${parseInt(params[0].chainId, 16)}/slip44:60`,
// name: params[0].chainName,
// type: 'evm',
// identifier: params[0].chainName,
// nativeCurrency: params[0].nativeCurrency,
// symbol: params[0].nativeCurrency.symbol, // Native currency symbol
// precision: params[0].nativeCurrency.decimals, // Currency precision
// providerUrl: params[0].rpcUrls[0],
// providers: params[0].rpcUrls,
// */
// }
//
// if (!chainFound) {
// throw new Error(`Chain with chainId ${chainIdToFind} not found.`);
// }
// }
// assetContextStorage.updateContext(currentProvider);
// // Save the updated provider to storage
// // @ts-ignore
// await web3ProviderStorage.saveWeb3Provider(currentProvider);
//
// console.log('changing context to ', currentProvider.caip);
// const result = await KEEPKEY_WALLET.setAssetContext(currentProvider);
// console.log('result ', result);
// console.log('KEEPKEY_WALLET.assetContext ', KEEPKEY_WALLET.assetContext);
// // Update context and notify changes
// chrome.runtime.sendMessage({ type: 'PROVIDER_CHANGED', provider: currentProvider });
// chrome.runtime.sendMessage({ type: 'ASSET_CONTEXT_UPDATED', assetContext: KEEPKEY_WALLET.assetContext });
//
// return true;
// };

const handleWalletGetSnaps = async () => {
return [];
};
Expand All @@ -293,11 +469,13 @@ const handleEthRequestAccounts = async ADDRESS => {
};

const handleSigningMethods = async (method, params, requestInfo, ADDRESS, KEEPKEY_WALLET, requireApproval) => {
const tag = TAG + ` | handle${method} | `;
const tag = TAG + ` | handleSigningMethods | `;
console.log(tag, 'method:', method);
console.log(tag, 'params:', params);
const currentProvider = await web3ProviderStorage.getWeb3Provider();
console.log(tag, 'currentProvider:', currentProvider);

if (!KEEPKEY_WALLET.assetContext) {
if (!KEEPKEY_WALLET.assetContext || currentProvider.caip !== KEEPKEY_WALLET.assetContext.caip) {
// Set context to the chain, defaults to ETH
const currentProvider = await web3ProviderStorage.getWeb3Provider();
await KEEPKEY_WALLET.setAssetContext({ caip: currentProvider.caip });
Expand Down
10 changes: 10 additions & 0 deletions chrome-extension/src/background/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,3 +414,13 @@ exampleSidebarStorage
.catch(error => {
console.error('Error fetching sidebar storage:', error);
});

chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
if (message.type === 'getMaskingSettings') {
chrome.storage.local.get(['enableMetaMaskMasking', 'enableXfiMasking', 'enableKeplrMasking'], result => {
console.log('getMaskingSettings result: ', result);
sendResponse(result);
});
return true; // To indicate asynchronous response
}
});
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "keepkey-client",
"version": "0.0.9",
"version": "0.0.10",
"description": "chrome extension for KeepKey",
"license": "GNU General Public License v3.0",
"repository": {
Expand Down
Loading

0 comments on commit e1e522f

Please sign in to comment.