This commit is contained in:
Christopher Franko 2015-09-01 20:42:36 -04:00
parent ae27c2eb7d
commit 4dab840f71
14 changed files with 45 additions and 45 deletions

View file

@ -1,4 +1,4 @@
If you'd like to contribute to go-ethereum please fork, fix, commit and If you'd like to contribute to go-expanse please fork, fix, commit and
send a pull request. Commits who do not comply with the coding standards send a pull request. Commits who do not comply with the coding standards
are ignored (use gofmt!). If you send pull requests make absolute sure that you are ignored (use gofmt!). If you send pull requests make absolute sure that you
commit on the `develop` branch and that you do not merge to master. commit on the `develop` branch and that you do not merge to master.

View file

@ -247,9 +247,9 @@ func (self *jsre) welcome() {
(function () { (function () {
console.log('instance: ' + web3.version.client); console.log('instance: ' + web3.version.client);
console.log(' datadir: ' + admin.datadir); console.log(' datadir: ' + admin.datadir);
console.log("coinbase: " + eth.coinbase); console.log("coinbase: " + exp.coinbase);
var ts = 1000 * eth.getBlock(eth.blockNumber).timestamp; var ts = 1000 * exp.getBlock(exp.blockNumber).timestamp;
console.log("at block: " + eth.blockNumber + " (" + new Date(ts) + ")"); console.log("at block: " + exp.blockNumber + " (" + new Date(ts) + ")");
})(); })();
`) `)
if modules, err := self.supportedApis(); err == nil { if modules, err := self.supportedApis(); err == nil {

View file

@ -381,7 +381,7 @@ func run(ctx *cli.Context) {
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
cfg.ExtraData = makeDefaultExtra() cfg.ExtraData = makeDefaultExtra()
ethereum, err := eth.New(cfg) expanse, err := exp.New(cfg)
if err != nil { if err != nil {
utils.Fatalf("%v", err) utils.Fatalf("%v", err)
} }

View file

@ -519,7 +519,7 @@ func StartIPC(exp *exp.Expanse, ctx *cli.Context) error {
} }
initializer := func(conn net.Conn) (shared.ExpanseApi, error) { initializer := func(conn net.Conn) (shared.ExpanseApi, error) {
fe := useragent.NewRemoteFrontend(conn, eth.AccountManager()) fe := useragent.NewRemoteFrontend(conn, exp.AccountManager())
xeth := xeth.New(exp, fe) xeth := xeth.New(exp, fe)
codec := codec.JSON codec := codec.JSON

View file

@ -1,18 +1,18 @@
// Copyright 2014 The go-ethereum Authors // Copyright 2014 The go-expanse Authors
// This file is part of the go-ethereum library. // This file is part of the go-expanse library.
// //
// The go-ethereum library is free software: you can redistribute it and/or modify // The go-expanse library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by // it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// The go-ethereum library is distributed in the hope that it will be useful, // The go-expanse library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details. // GNU Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. // along with the go-expanse library. If not, see <http://www.gnu.org/licenses/>.
package vm package vm

View file

@ -1,18 +1,18 @@
// Copyright 2014 The go-ethereum Authors // Copyright 2014 The go-expanse Authors
// This file is part of the go-ethereum library. // This file is part of the go-expanse library.
// //
// The go-ethereum library is free software: you can redistribute it and/or modify // The go-expanse library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by // it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// The go-ethereum library is distributed in the hope that it will be useful, // The go-expanse library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details. // GNU Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. // along with the go-expanse library. If not, see <http://www.gnu.org/licenses/>.
package vm package vm

View file

@ -1,18 +1,18 @@
// Copyright 2014 The go-ethereum Authors // Copyright 2014 The go-expanse Authors
// This file is part of the go-ethereum library. // This file is part of the go-expanse library.
// //
// The go-ethereum library is free software: you can redistribute it and/or modify // The go-expanse library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by // it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// The go-ethereum library is distributed in the hope that it will be useful, // The go-expanse library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details. // GNU Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. // along with the go-expanse library. If not, see <http://www.gnu.org/licenses/>.
package vm package vm
import ( import (

View file

@ -372,7 +372,7 @@ func New(config *Config) (*Expanse, error) {
exp.blockProcessor = core.NewBlockProcessor(chainDb, exp.pow, exp.chainManager, exp.EventMux()) exp.blockProcessor = core.NewBlockProcessor(chainDb, exp.pow, exp.chainManager, exp.EventMux())
exp.chainManager.SetProcessor(exp.blockProcessor) exp.chainManager.SetProcessor(exp.blockProcessor)
exp.protocolManager = NewProtocolManager(config.NetworkId, exp.eventMux, eth.txPool, exp.pow, exp.chainManager) exp.protocolManager = NewProtocolManager(config.NetworkId, exp.eventMux, exp.txPool, exp.pow, exp.chainManager)
exp.miner = miner.New(eth, exp.EventMux(), exp.pow) exp.miner = miner.New(eth, exp.EventMux(), exp.pow)
exp.miner.SetGasPrice(config.GasPrice) exp.miner.SetGasPrice(config.GasPrice)

View file

@ -54,8 +54,8 @@ func NewGasPriceOracle(exp *Expanse) (self *GasPriceOracle) {
core.ChainSplitEvent{}, core.ChainSplitEvent{},
) )
minbase := new(big.Int).Mul(self.eth.GpoMinGasPrice, big.NewInt(100)) minbase := new(big.Int).Mul(self.exp.GpoMinGasPrice, big.NewInt(100))
minbase = minbase.Div(minbase, big.NewInt(int64(self.eth.GpobaseCorrectionFactor))) minbase = minbase.Div(minbase, big.NewInt(int64(self.exp.GpobaseCorrectionFactor)))
self.minBase = minbase self.minBase = minbase
self.processPastBlocks() self.processPastBlocks()

View file

@ -1764,20 +1764,20 @@ if (typeof XMLHttpRequest === 'undefined') {
},{}],18:[function(require,module,exports){ },{}],18:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of expanse.js.
ethereum.js is free software: you can redistribute it and/or modify expanse.js is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
ethereum.js is distributed in the hope that it will be useful, expanse.js is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details. GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with expanse.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** @file config.js /** @file config.js
* @authors: * @authors:
@ -4231,7 +4231,7 @@ var Iban = function (iban) {
}; };
/** /**
* This method should be used to create iban object from ethereum address * This method should be used to create iban object from expanse address
* *
* @method fromAddress * @method fromAddress
* @param {String} address * @param {String} address
@ -4935,7 +4935,7 @@ module.exports = {
along with expanse.js. If not, see <http://www.gnu.org/licenses/>. along with expanse.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file eth.js * @file exp.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @author Fabian Vogelsteller <fabian@ethdev.com> * @author Fabian Vogelsteller <fabian@ethdev.com>
* @date 2015 * @date 2015
@ -5227,7 +5227,7 @@ module.exports = {
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with expanse.js. If not, see <http://www.gnu.org/licenses/>. along with expanse.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** @file eth.js /** @file exp.js
* @authors: * @authors:
* Marek Kotewicz <marek@ethdev.com> * Marek Kotewicz <marek@ethdev.com>
* @date 2015 * @date 2015
@ -5355,7 +5355,7 @@ module.exports = {
var Method = require('../method'); var Method = require('../method');
/// @returns an array of objects describing web3.eth.filter api methods /// @returns an array of objects describing web3.exp.filter api methods
var eth = function () { var eth = function () {
var newFilterCall = function (args) { var newFilterCall = function (args) {
var type = args[0]; var type = args[0];
@ -5965,7 +5965,7 @@ var transfer = function (from, to, value, callback) {
* @param {Function} callback, callback * @param {Function} callback, callback
*/ */
var transferToAddress = function (from, to, value, callback) { var transferToAddress = function (from, to, value, callback) {
return web3.eth.sendTransaction({ return web3.exp.sendTransaction({
address: to, address: to,
from: from, from: from,
value: value value: value

View file

@ -1,18 +1,18 @@
// Copyright 2015 The go-ethereum Authors // Copyright 2015 The go-expanse Authors
// This file is part of the go-ethereum library. // This file is part of the go-expanse library.
// //
// The go-ethereum library is free software: you can redistribute it and/or modify // The go-expanse library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by // it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// The go-ethereum library is distributed in the hope that it will be useful, // The go-expanse library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details. // GNU Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. // along with the go-expanse library. If not, see <http://www.gnu.org/licenses/>.
package jsre package jsre

View file

@ -123,7 +123,7 @@ func (self *minerApi) SetExtra(req *shared.Request) (interface{}, error) {
return nil, err return nil, err
} }
if err := self.ethereum.Miner().SetExtra([]byte(args.Data)); err != nil { if err := self.expanse.Miner().SetExtra([]byte(args.Data)); err != nil {
return false, err return false, err
} }

View file

@ -134,7 +134,7 @@ func (self *personalApi) UnlockAccount(req *shared.Request) (interface{}, error)
return fe.UnlockAccount(common.HexToAddress(args.Address).Bytes()), nil return fe.UnlockAccount(common.HexToAddress(args.Address).Bytes()), nil
} }
am := self.ethereum.AccountManager() am := self.expanse.AccountManager()
addr := common.HexToAddress(args.Address) addr := common.HexToAddress(args.Address)
err := am.TimedUnlock(addr, args.Passphrase, time.Duration(args.Duration)*time.Second) err := am.TimedUnlock(addr, args.Passphrase, time.Duration(args.Duration)*time.Second)

View file

@ -1,18 +1,18 @@
// Copyright 2015 The go-ethereum Authors // Copyright 2015 The go-expanse Authors
// This file is part of the go-ethereum library. // This file is part of the go-expanse library.
// //
// The go-ethereum library is free software: you can redistribute it and/or modify // The go-expanse library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by // it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// The go-ethereum library is distributed in the hope that it will be useful, // The go-expanse library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details. // GNU Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. // along with the go-expanse library. If not, see <http://www.gnu.org/licenses/>.
package useragent package useragent