conflux-web
Advanced tools
Comparing version 0.1.0-alpha.0 to 0.1.0-alpha.1
@@ -28,3 +28,3 @@ 'use strict'; | ||
_this = _possibleConstructorReturn(this, _getPrototypeOf(ConfluxWeb).call(this, provider, options, null, net)); | ||
_this.eth = new confluxWebCfx.Eth(_this.currentProvider, net, options); | ||
_this.cfx = new confluxWebCfx.Cfx(_this.currentProvider, net, options); | ||
_this.utils = Utils; | ||
@@ -37,3 +37,3 @@ _this.version = version; | ||
value: function setProvider(provider, net) { | ||
return _get(_getPrototypeOf(ConfluxWeb.prototype), "setProvider", this).call(this, provider, net) && this.eth.setProvider(provider, net); | ||
return _get(_getPrototypeOf(ConfluxWeb.prototype), "setProvider", this).call(this, provider, net) && this.cfx.setProvider(provider, net); | ||
} | ||
@@ -44,3 +44,3 @@ }, { | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultGasPrice", value, this, true); | ||
this.eth.defaultGasPrice = value; | ||
this.cfx.defaultGasPrice = value; | ||
} | ||
@@ -55,3 +55,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultGas", value, this, true); | ||
this.eth.defaultGas = value; | ||
this.cfx.defaultGas = value; | ||
} | ||
@@ -66,3 +66,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "transactionBlockTimeout", value, this, true); | ||
this.eth.transactionBlockTimeout = value; | ||
this.cfx.transactionBlockTimeout = value; | ||
} | ||
@@ -77,3 +77,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "transactionConfirmationBlocks", value, this, true); | ||
this.eth.transactionConfirmationBlocks = value; | ||
this.cfx.transactionConfirmationBlocks = value; | ||
} | ||
@@ -88,3 +88,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "transactionPollingTimeout", value, this, true); | ||
this.eth.transactionPollingTimeout = value; | ||
this.cfx.transactionPollingTimeout = value; | ||
} | ||
@@ -99,3 +99,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultAccount", value, this, true); | ||
this.eth.defaultAccount = value; | ||
this.cfx.defaultAccount = value; | ||
} | ||
@@ -110,3 +110,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultBlock", value, this, true); | ||
this.eth.defaultBlock = value; | ||
this.cfx.defaultBlock = value; | ||
} | ||
@@ -127,4 +127,4 @@ , | ||
return { | ||
Eth: function Eth(provider, options, net) { | ||
return new confluxWebCfx.Eth(providerResolver.resolve(provider, net), options); | ||
Cfx: function Cfx(provider, options, net) { | ||
return new confluxWebCfx.Cfx(providerResolver.resolve(provider, net), options); | ||
}, | ||
@@ -131,0 +131,0 @@ Net: function Net(provider, options, net) { |
import { AbstractWeb3Module } from 'conflux-web-core'; | ||
import { ProviderDetector, ProvidersModuleFactory } from 'conflux-web-providers'; | ||
import * as Utils from 'conflux-web-utils'; | ||
import { Eth } from 'conflux-web-cfx'; | ||
import { Cfx } from 'conflux-web-cfx'; | ||
import { Network } from 'conflux-web-net'; | ||
@@ -12,3 +12,3 @@ | ||
super(provider, options, null, net); | ||
this.eth = new Eth(this.currentProvider, net, options); | ||
this.cfx = new Cfx(this.currentProvider, net, options); | ||
this.utils = Utils; | ||
@@ -19,3 +19,3 @@ this.version = version; | ||
super.defaultGasPrice = value; | ||
this.eth.defaultGasPrice = value; | ||
this.cfx.defaultGasPrice = value; | ||
} | ||
@@ -27,3 +27,3 @@ get defaultGasPrice() { | ||
super.defaultGas = value; | ||
this.eth.defaultGas = value; | ||
this.cfx.defaultGas = value; | ||
} | ||
@@ -35,3 +35,3 @@ get defaultGas() { | ||
super.transactionBlockTimeout = value; | ||
this.eth.transactionBlockTimeout = value; | ||
this.cfx.transactionBlockTimeout = value; | ||
} | ||
@@ -43,3 +43,3 @@ get transactionBlockTimeout() { | ||
super.transactionConfirmationBlocks = value; | ||
this.eth.transactionConfirmationBlocks = value; | ||
this.cfx.transactionConfirmationBlocks = value; | ||
} | ||
@@ -51,3 +51,3 @@ get transactionConfirmationBlocks() { | ||
super.transactionPollingTimeout = value; | ||
this.eth.transactionPollingTimeout = value; | ||
this.cfx.transactionPollingTimeout = value; | ||
} | ||
@@ -59,3 +59,3 @@ get transactionPollingTimeout() { | ||
super.defaultAccount = value; | ||
this.eth.defaultAccount = value; | ||
this.cfx.defaultAccount = value; | ||
} | ||
@@ -67,3 +67,3 @@ get defaultAccount() { | ||
super.defaultBlock = value; | ||
this.eth.defaultBlock = value; | ||
this.cfx.defaultBlock = value; | ||
} | ||
@@ -74,3 +74,3 @@ get defaultBlock() { | ||
setProvider(provider, net) { | ||
return super.setProvider(provider, net) && this.eth.setProvider(provider, net); | ||
return super.setProvider(provider, net) && this.cfx.setProvider(provider, net); | ||
} | ||
@@ -83,4 +83,4 @@ static get givenProvider() { | ||
return { | ||
Eth: (provider, options, net) => { | ||
return new Eth(providerResolver.resolve(provider, net), options); | ||
Cfx: (provider, options, net) => { | ||
return new Cfx(providerResolver.resolve(provider, net), options); | ||
}, | ||
@@ -87,0 +87,0 @@ Net: (provider, options, net) => { |
@@ -25,3 +25,3 @@ (function (global, factory) { | ||
_this = _possibleConstructorReturn(this, _getPrototypeOf(ConfluxWeb).call(this, provider, options, null, net)); | ||
_this.eth = new confluxWebCfx.Eth(_this.currentProvider, net, options); | ||
_this.cfx = new confluxWebCfx.Cfx(_this.currentProvider, net, options); | ||
_this.utils = Utils; | ||
@@ -34,3 +34,3 @@ _this.version = version; | ||
value: function setProvider(provider, net) { | ||
return _get(_getPrototypeOf(ConfluxWeb.prototype), "setProvider", this).call(this, provider, net) && this.eth.setProvider(provider, net); | ||
return _get(_getPrototypeOf(ConfluxWeb.prototype), "setProvider", this).call(this, provider, net) && this.cfx.setProvider(provider, net); | ||
} | ||
@@ -41,3 +41,3 @@ }, { | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultGasPrice", value, this, true); | ||
this.eth.defaultGasPrice = value; | ||
this.cfx.defaultGasPrice = value; | ||
} | ||
@@ -52,3 +52,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultGas", value, this, true); | ||
this.eth.defaultGas = value; | ||
this.cfx.defaultGas = value; | ||
} | ||
@@ -63,3 +63,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "transactionBlockTimeout", value, this, true); | ||
this.eth.transactionBlockTimeout = value; | ||
this.cfx.transactionBlockTimeout = value; | ||
} | ||
@@ -74,3 +74,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "transactionConfirmationBlocks", value, this, true); | ||
this.eth.transactionConfirmationBlocks = value; | ||
this.cfx.transactionConfirmationBlocks = value; | ||
} | ||
@@ -85,3 +85,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "transactionPollingTimeout", value, this, true); | ||
this.eth.transactionPollingTimeout = value; | ||
this.cfx.transactionPollingTimeout = value; | ||
} | ||
@@ -96,3 +96,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultAccount", value, this, true); | ||
this.eth.defaultAccount = value; | ||
this.cfx.defaultAccount = value; | ||
} | ||
@@ -107,3 +107,3 @@ , | ||
_set(_getPrototypeOf(ConfluxWeb.prototype), "defaultBlock", value, this, true); | ||
this.eth.defaultBlock = value; | ||
this.cfx.defaultBlock = value; | ||
} | ||
@@ -124,4 +124,4 @@ , | ||
return { | ||
Eth: function Eth(provider, options, net) { | ||
return new confluxWebCfx.Eth(providerResolver.resolve(provider, net), options); | ||
Cfx: function Cfx(provider, options, net) { | ||
return new confluxWebCfx.Cfx(providerResolver.resolve(provider, net), options); | ||
}, | ||
@@ -128,0 +128,0 @@ Net: function Net(provider, options, net) { |
{ | ||
"name": "conflux-web", | ||
"version": "0.1.0-alpha.0", | ||
"version": "0.1.0-alpha.1", | ||
"description": "Conflux JavaScript API", | ||
@@ -33,9 +33,9 @@ "repository": "https://github.com/Conflux-Chain/ConfluxWeb/tree/master/packages/conflux-web", | ||
"@types/node": "^10.12.18", | ||
"conflux-web-cfx": "0.1.0-alpha.0", | ||
"conflux-web-core": "0.1.0-alpha.0", | ||
"conflux-web-core-helpers": "0.1.0-alpha.0", | ||
"conflux-web-core-method": "0.1.0-alpha.0", | ||
"conflux-web-net": "0.1.0-alpha.0", | ||
"conflux-web-providers": "0.1.0-alpha.0", | ||
"conflux-web-utils": "0.1.0-alpha.0" | ||
"conflux-web-cfx": "0.1.0-alpha.1", | ||
"conflux-web-core": "0.1.0-alpha.1", | ||
"conflux-web-core-helpers": "0.1.0-alpha.1", | ||
"conflux-web-core-method": "0.1.0-alpha.1", | ||
"conflux-web-net": "0.1.0-alpha.1", | ||
"conflux-web-providers": "0.1.0-alpha.1", | ||
"conflux-web-utils": "0.1.0-alpha.1" | ||
}, | ||
@@ -51,3 +51,3 @@ "devDependencies": { | ||
], | ||
"gitHead": "fbae6c1bc1c3e4ab1325e7bbec4ef1868255e246" | ||
"gitHead": "57701da6365fb81980ddfc957f46966f722c3ebf" | ||
} |
@@ -24,3 +24,3 @@ /* | ||
import {provider} from 'conflux-web-providers'; | ||
import {Eth} from 'conflux-web-cfx'; | ||
import {Cfx} from 'conflux-web-cfx'; | ||
import {Network} from 'conflux-web-net'; | ||
@@ -39,3 +39,3 @@ | ||
utils: Utils; | ||
eth: Eth; | ||
cfx: Cfx; | ||
version: string; | ||
@@ -45,4 +45,4 @@ } | ||
export interface Modules { | ||
Eth: new (provider: provider, net: net.Socket) => Eth; | ||
Cfx: new (provider: provider, net: net.Socket) => Cfx; | ||
Net: new (provider: provider, net: net.Socket) => Network; | ||
} |
+ Addedconflux-web-cfx@0.1.0-alpha.1(transitive)
+ Addedconflux-web-cfx-abi@0.1.0-alpha.1(transitive)
+ Addedconflux-web-cfx-accounts@0.1.0-alpha.1(transitive)
+ Addedconflux-web-cfx-contract@0.1.0-alpha.1(transitive)
+ Addedconflux-web-core@0.1.0-alpha.1(transitive)
+ Addedconflux-web-core-helpers@0.1.0-alpha.1(transitive)
+ Addedconflux-web-core-method@0.1.0-alpha.1(transitive)
+ Addedconflux-web-core-subscriptions@0.1.0-alpha.1(transitive)
+ Addedconflux-web-net@0.1.0-alpha.1(transitive)
+ Addedconflux-web-providers@0.1.0-alpha.1(transitive)
+ Addedconflux-web-utils@0.1.0-alpha.1(transitive)
- Removedconflux-web-cfx@0.1.0-alpha.0(transitive)
- Removedconflux-web-cfx-abi@0.1.0-alpha.0(transitive)
- Removedconflux-web-cfx-accounts@0.1.0-alpha.0(transitive)
- Removedconflux-web-cfx-contract@0.1.0-alpha.0(transitive)
- Removedconflux-web-core@0.1.0-alpha.0(transitive)
- Removedconflux-web-core-helpers@0.1.0-alpha.0(transitive)
- Removedconflux-web-core-method@0.1.0-alpha.0(transitive)
- Removedconflux-web-core-subscriptions@0.1.0-alpha.0(transitive)
- Removedconflux-web-net@0.1.0-alpha.0(transitive)
- Removedconflux-web-providers@0.1.0-alpha.0(transitive)
- Removedconflux-web-utils@0.1.0-alpha.0(transitive)