Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/metamask-connect-flow
This commit is contained in:
@@ -5,6 +5,10 @@
|
||||
{
|
||||
"note": "Start jsonRpcRequestId at 1, not 0 as 0 breaks the web3.js websocket RPC provider",
|
||||
"pr": 1227
|
||||
},
|
||||
{
|
||||
"note":
|
||||
"Fix the bug when order watcher was trying to convert undefined to an object in case of CancelUpTo event"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@@ -50,7 +50,7 @@ export class DependentOrderHashesTracker {
|
||||
return uniqueOrderHashList;
|
||||
}
|
||||
public getDependentOrderHashesByMaker(makerAddress: string): string[] {
|
||||
const dependentOrderHashes = Array.from(this._orderHashesByMakerAddress[makerAddress]);
|
||||
const dependentOrderHashes = Array.from(this._orderHashesByMakerAddress[makerAddress] || {});
|
||||
return dependentOrderHashes;
|
||||
}
|
||||
public getDependentOrderHashesByAssetDataByMaker(makerAddress: string, assetData: string): string[] {
|
||||
|
||||
@@ -32,7 +32,6 @@ const DEFAULT_ADDRESS_SEARCH_LIMIT = 1000;
|
||||
*/
|
||||
export class LedgerSubprovider extends BaseWalletSubprovider {
|
||||
// tslint:disable-next-line:no-unused-variable
|
||||
private readonly _nonceLock = new Lock();
|
||||
private readonly _connectionLock = new Lock();
|
||||
private readonly _networkId: number;
|
||||
private _baseDerivationPath: string;
|
||||
|
||||
@@ -56,10 +56,11 @@ export const walletUtils = {
|
||||
parentDerivedKeyInfo: DerivedHDKeyInfo,
|
||||
searchLimit: number,
|
||||
): DerivedHDKeyInfo | undefined {
|
||||
const lowercaseAddress = address.toLowerCase();
|
||||
let matchedKey: DerivedHDKeyInfo | undefined;
|
||||
const derivedKeyIterator = new DerivedHDKeyInfoIterator(parentDerivedKeyInfo, searchLimit);
|
||||
for (const key of derivedKeyIterator) {
|
||||
if (key.address === address) {
|
||||
if (key.address === lowercaseAddress) {
|
||||
matchedKey = key;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user