crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Last remaining website fixes

Browse Source
This commit is contained in:
Fabio Berger
2017-11-27 22:23:51 -06:00
parent 5a59ac4c6b
commit 78f0ab3682
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/0x.js/test/exchange_wrapper_test.ts
View File

@@ -680,7 +680,7 @@ describe('ExchangeWrapper', () => {
await zeroEx.exchange.cancelOrderAsync(signedOrder, cancelTakerAmountInBaseUnits); await zeroEx.exchange.cancelOrderAsync(signedOrder, cancelTakerAmountInBaseUnits);
})().catch(done); })().catch(done);
}); });
it('Outstanding subscriptions are cancelled when zeroEx.setProviderAsync called', (done: DoneCallback) => { it('Outstanding subscriptions are cancelled when zeroEx.setProvider called', (done: DoneCallback) => {
(async () => { (async () => {
const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<LogFillContractEventArgs>) => { const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<LogFillContractEventArgs>) => {

2
packages/0x.js/test/token_wrapper_test.ts
View File

@@ -398,7 +398,7 @@ describe('TokenWrapper', () => {
await zeroEx.token.setAllowanceAsync(tokenAddress, coinbase, addressWithoutFunds, allowanceAmount); await zeroEx.token.setAllowanceAsync(tokenAddress, coinbase, addressWithoutFunds, allowanceAmount);
})().catch(done); })().catch(done);
}); });
it('Outstanding subscriptions are cancelled when zeroEx.setProviderAsync called', (done: DoneCallback) => { it('Outstanding subscriptions are cancelled when zeroEx.setProvider called', (done: DoneCallback) => {
(async () => { (async () => {
const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => { const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
done(new Error('Expected this subscription to have been cancelled')); done(new Error('Expected this subscription to have been cancelled'));

16
packages/website/ts/blockchain.ts
View File

@@ -217,7 +217,7 @@ export class Blockchain {
this.web3Wrapper.destroy(); this.web3Wrapper.destroy();
const shouldPollUserAddress = false; const shouldPollUserAddress = false;
this.web3Wrapper = new Web3Wrapper(this.dispatcher, provider, this.networkId, shouldPollUserAddress); this.web3Wrapper = new Web3Wrapper(this.dispatcher, provider, this.networkId, shouldPollUserAddress);
await this.zeroEx.setProviderAsync(provider); this.zeroEx.setProvider(provider, networkId);
await this.postInstantiationOrUpdatingProviderZeroExAsync(); await this.postInstantiationOrUpdatingProviderZeroExAsync();
break; break;
} }
@@ -229,7 +229,7 @@ export class Blockchain {
provider = this.cachedProvider; provider = this.cachedProvider;
const shouldPollUserAddress = true; const shouldPollUserAddress = true;
this.web3Wrapper = new Web3Wrapper(this.dispatcher, provider, this.networkId, shouldPollUserAddress); this.web3Wrapper = new Web3Wrapper(this.dispatcher, provider, this.networkId, shouldPollUserAddress);
await this.zeroEx.setProviderAsync(provider); this.zeroEx.setProvider(provider, this.networkId);
await this.postInstantiationOrUpdatingProviderZeroExAsync(); await this.postInstantiationOrUpdatingProviderZeroExAsync();
delete this.ledgerSubProvider; delete this.ledgerSubProvider;
delete this.cachedProvider; delete this.cachedProvider;
@@ -612,7 +612,7 @@ export class Blockchain {
return tokenByAddress; return tokenByAddress;
} }
private async onPageLoadInitFireAndForgetAsync() { private async onPageLoadInitFireAndForgetAsync() {
await this.onPageLoadAsync(); // wait for page to load await Blockchain.onPageLoadAsync(); // wait for page to load
// Hack: We need to know the networkId the injectedWeb3 is connected to (if it is defined) in // Hack: We need to know the networkId the injectedWeb3 is connected to (if it is defined) in
// order to properly instantiate the web3Wrapper. Since we must use the async call, we cannot // order to properly instantiate the web3Wrapper. Since we must use the async call, we cannot
@@ -630,8 +630,10 @@ export class Blockchain {
} }
} }
const provider = await this.getProviderAsync(injectedWeb3, networkId); const provider = await Blockchain.getProviderAsync(injectedWeb3, networkId);
this.zeroEx = new ZeroEx(provider); this.zeroEx = new ZeroEx(provider, {
networkId,
});
this.updateProviderName(injectedWeb3); this.updateProviderName(injectedWeb3);
const shouldPollUserAddress = true; const shouldPollUserAddress = true;
this.web3Wrapper = new Web3Wrapper(this.dispatcher, provider, networkId, shouldPollUserAddress); this.web3Wrapper = new Web3Wrapper(this.dispatcher, provider, networkId, shouldPollUserAddress);
@@ -641,12 +643,12 @@ export class Blockchain {
// of the ZeroEx instance. // of the ZeroEx instance.
private async postInstantiationOrUpdatingProviderZeroExAsync() { private async postInstantiationOrUpdatingProviderZeroExAsync() {
utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.'); utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
this.exchangeAddress = await this.zeroEx.exchange.getContractAddressAsync(); this.exchangeAddress = await this.zeroEx.exchange.getContractAddress();
} }
private updateProviderName(injectedWeb3: Web3) { private updateProviderName(injectedWeb3: Web3) {
const doesInjectedWeb3Exist = !_.isUndefined(injectedWeb3); const doesInjectedWeb3Exist = !_.isUndefined(injectedWeb3);
const providerName = doesInjectedWeb3Exist ? const providerName = doesInjectedWeb3Exist ?
this.getNameGivenProvider(injectedWeb3.currentProvider) : Blockchain.getNameGivenProvider(injectedWeb3.currentProvider) :
constants.PUBLIC_PROVIDER_NAME; constants.PUBLIC_PROVIDER_NAME;
this.dispatcher.updateInjectedProviderName(providerName); this.dispatcher.updateInjectedProviderName(providerName);
} }

2
packages/website/ts/subproviders/redundant_rpc_subprovider.ts
View File

@@ -33,7 +33,7 @@ export class RedundantRPCSubprovider extends Subprovider {
end: (err?: Error, data?: any) => void): Promise<void> { end: (err?: Error, data?: any) => void): Promise<void> {
const rpcsCopy = this.rpcs.slice(); const rpcsCopy = this.rpcs.slice();
try { try {
const data = await this.firstSuccessAsync(rpcsCopy, payload, next); const data = await RedundantRPCSubprovider.firstSuccessAsync(rpcsCopy, payload, next);
end(null, data); end(null, data);
} catch (err) { } catch (err) {
end(err); end(err);