mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
synced up to go-ethereum 1.5.0-unstable develop branch major features: * api overhaul due to rpc v2 and node service stack interface changes * blockchain/ethereum contract interaction rewritten using abi/abigen (chequebook, ens) * swarm - cluster control CLI - migration and revamp of prehistoric eth-utils repo * poor man's end to end testing: scripted scenarios in swarm/test using swarm CLI * http proxy now handles 3 url schemes for 1) ens-enabled [bzz], 2) immutable [bzzi] and 3) raw manifest [bzzr] resolution * fixes issues with remote address setting, forwarding and syncing * new control flags to switch swap and sync on and off * placeholder basic implementation Ethereum Name Service * improved logging - now debug level is coherent regression: * uri based versioning support is dropped temporarily since state tree pruning does not guarantee historical record * registrar related functionality temporarily restricted - current ENS provides basic free and unrestricted Register/Resolve accounts/abi: * bind: repeated attempt deployment of contracts, validation against known code, transactor creation from private keys * accountmanager: getUnlocked snatch private key when unlocked cmd: * unlockAccount moved to utils/cmd and exported * getPassPhrase moved to utils/input and exported * accountcmds: reflect the change * js: GlobalRegistrar is dropped (ens) flags: * chequebook, bzzaccount, bzzport, bzzconfig, bzznoswap, bzznosync chequebook: * move from common/ to swarm/services * abigen-ised * specifies its own API (removed chequebook api from swarm/api) kademlia: * move from common to swarm/network/kademlia * address abstracted out to separate file + tests dns/ens/registrar: * moved from swarm/api to swarm/services/ens * implementation is basic placeholder before ENS is implemented * temporary rpc api via ens namespace * the old common/registrar is removed (also from eth/backend apis) swap: * the abstract swap module moved from common to swarm/services * now embedded in the swarm and chequebook specific setup (this will change) * safer chequebook deployment using abigen helpers * backend not field of swap params eth: * public accessor for GPO, needed to construct a PublicBlockChainAPI * extends ContractBackend in eth/bind.go with BalanceAt, GetTxReceipt and CodeAt API calls internal/web3ext * add js bindings for bzz, chequebook rpc apis swarm/api: * refactored api into smaller modules filesystem/storage/testapi * ethereum backend (needed for dns, swap, etc) moved to abi/bind * TODO: further refactor due to #2040 * swarm/api/http: now supports the 3 uri schemes * examples/album updated swarm/cmd: * migrate old eth-utils and modify into a cluster control CLI * bzzup now allows non-local gateway, endpoint specified as second argument swarm/network: * forwarder improved log messages, fixup condition on whether syncer is nil * hive extended with controls for testing support block read/write, swap/sync enabled/disabled * hive keepAlive launches with alarm in case no discover and no kaddb * fix IP address formatting issue [::1] -> became ::1 which refused to dial, now use discover.NewNode#String * integrate functionality for enabling/disabling sync and swap * allow nil sync state - improve syncer interface in protocol * fix SData slice out of bounds bug swarm/test * poor man's testing framework. scripts invoking swarm/cmd/swarm * added tests for basic scenarios connections, swap, sync swarm: * rewrite api using rpc v2 * blockchain comms via abi/abigen + eth.ContractBackend * integrate new flags
236 lines
7.5 KiB
Go
236 lines
7.5 KiB
Go
// Copyright 2016 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
|
|
"github.com/codegangsta/cli"
|
|
"github.com/ethereum/go-ethereum/cmd/utils"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
)
|
|
|
|
var (
|
|
walletCommand = cli.Command{
|
|
Name: "wallet",
|
|
Usage: "ethereum presale wallet",
|
|
Subcommands: []cli.Command{
|
|
{
|
|
Action: importWallet,
|
|
Name: "import",
|
|
Usage: "import ethereum presale wallet",
|
|
},
|
|
},
|
|
Description: `
|
|
|
|
get wallet import /path/to/my/presale.wallet
|
|
|
|
will prompt for your password and imports your ether presale account.
|
|
It can be used non-interactively with the --password option taking a
|
|
passwordfile as argument containing the wallet password in plaintext.
|
|
|
|
`}
|
|
accountCommand = cli.Command{
|
|
Action: accountList,
|
|
Name: "account",
|
|
Usage: "manage accounts",
|
|
Description: `
|
|
|
|
Manage accounts lets you create new accounts, list all existing accounts,
|
|
import a private key into a new account.
|
|
|
|
' help' shows a list of subcommands or help for one subcommand.
|
|
|
|
It supports interactive mode, when you are prompted for password as well as
|
|
non-interactive mode where passwords are supplied via a given password file.
|
|
Non-interactive mode is only meant for scripted use on test networks or known
|
|
safe environments.
|
|
|
|
Make sure you remember the password you gave when creating a new account (with
|
|
either new or import). Without it you are not able to unlock your account.
|
|
|
|
Note that exporting your key in unencrypted format is NOT supported.
|
|
|
|
Keys are stored under <DATADIR>/keys.
|
|
It is safe to transfer the entire directory or the individual keys therein
|
|
between ethereum nodes by simply copying.
|
|
Make sure you backup your keys regularly.
|
|
|
|
In order to use your account to send transactions, you need to unlock them using
|
|
the '--unlock' option. The argument is a space separated list of addresses or
|
|
indexes. If used non-interactively with a passwordfile, the file should contain
|
|
the respective passwords one per line. If you unlock n accounts and the password
|
|
file contains less than n entries, then the last password is meant to apply to
|
|
all remaining accounts.
|
|
|
|
And finally. DO NOT FORGET YOUR PASSWORD.
|
|
`,
|
|
Subcommands: []cli.Command{
|
|
{
|
|
Action: accountList,
|
|
Name: "list",
|
|
Usage: "print account addresses",
|
|
},
|
|
{
|
|
Action: accountCreate,
|
|
Name: "new",
|
|
Usage: "create a new account",
|
|
Description: `
|
|
|
|
ethereum account new
|
|
|
|
Creates a new account. Prints the address.
|
|
|
|
The account is saved in encrypted format, you are prompted for a passphrase.
|
|
|
|
You must remember this passphrase to unlock your account in the future.
|
|
|
|
For non-interactive use the passphrase can be specified with the --password flag:
|
|
|
|
ethereum --password <passwordfile> account new
|
|
|
|
Note, this is meant to be used for testing only, it is a bad idea to save your
|
|
password to file or expose in any other way.
|
|
`,
|
|
},
|
|
{
|
|
Action: accountUpdate,
|
|
Name: "update",
|
|
Usage: "update an existing account",
|
|
Description: `
|
|
|
|
ethereum account update <address>
|
|
|
|
Update an existing account.
|
|
|
|
The account is saved in the newest version in encrypted format, you are prompted
|
|
for a passphrase to unlock the account and another to save the updated file.
|
|
|
|
This same command can therefore be used to migrate an account of a deprecated
|
|
format to the newest format or change the password for an account.
|
|
|
|
For non-interactive use the passphrase can be specified with the --password flag:
|
|
|
|
ethereum --password <passwordfile> account update <address>
|
|
|
|
Since only one password can be given, only format update can be performed,
|
|
changing your password is only possible interactively.
|
|
`,
|
|
},
|
|
{
|
|
Action: accountImport,
|
|
Name: "import",
|
|
Usage: "import a private key into a new account",
|
|
Description: `
|
|
|
|
ethereum account import <keyfile>
|
|
|
|
Imports an unencrypted private key from <keyfile> and creates a new account.
|
|
Prints the address.
|
|
|
|
The keyfile is assumed to contain an unencrypted private key in hexadecimal format.
|
|
|
|
The account is saved in encrypted format, you are prompted for a passphrase.
|
|
|
|
You must remember this passphrase to unlock your account in the future.
|
|
|
|
For non-interactive use the passphrase can be specified with the -password flag:
|
|
|
|
ethereum --password <passwordfile> account import <keyfile>
|
|
|
|
Note:
|
|
As you can directly copy your encrypted accounts to another ethereum instance,
|
|
this import mechanism is not needed when you transfer an account between
|
|
nodes.
|
|
`,
|
|
},
|
|
},
|
|
}
|
|
)
|
|
|
|
func accountList(ctx *cli.Context) {
|
|
accman := utils.MakeAccountManager(ctx)
|
|
for i, acct := range accman.Accounts() {
|
|
fmt.Printf("Account #%d: {%x} %s\n", i, acct.Address, acct.File)
|
|
}
|
|
}
|
|
|
|
// accountCreate creates a new account into the keystore defined by the CLI flags.
|
|
func accountCreate(ctx *cli.Context) {
|
|
accman := utils.MakeAccountManager(ctx)
|
|
password := utils.GetPassPhrase("Your new account is locked with a password. Please give a password. Do not forget this password.", true, 0, utils.MakePasswordList(ctx))
|
|
|
|
account, err := accman.NewAccount(password)
|
|
if err != nil {
|
|
utils.Fatalf("Failed to create account: %v", err)
|
|
}
|
|
fmt.Printf("Address: {%x}\n", account.Address)
|
|
}
|
|
|
|
// accountUpdate transitions an account from a previous format to the current
|
|
// one, also providing the possibility to change the pass-phrase.
|
|
func accountUpdate(ctx *cli.Context) {
|
|
if len(ctx.Args()) == 0 {
|
|
utils.Fatalf("No accounts specified to update")
|
|
}
|
|
accman := utils.MakeAccountManager(ctx)
|
|
|
|
account, oldPassword := utils.UnlockAccount(accman, ctx.Args().First(), 0, nil)
|
|
newPassword := utils.GetPassPhrase("Please give a new password. Do not forget this password.", true, 0, nil)
|
|
if err := accman.Update(account, oldPassword, newPassword); err != nil {
|
|
utils.Fatalf("Could not update the account: %v", err)
|
|
}
|
|
}
|
|
|
|
func importWallet(ctx *cli.Context) {
|
|
keyfile := ctx.Args().First()
|
|
if len(keyfile) == 0 {
|
|
utils.Fatalf("keyfile must be given as argument")
|
|
}
|
|
keyJson, err := ioutil.ReadFile(keyfile)
|
|
if err != nil {
|
|
utils.Fatalf("Could not read wallet file: %v", err)
|
|
}
|
|
|
|
accman := utils.MakeAccountManager(ctx)
|
|
passphrase := utils.GetPassPhrase("", false, 0, utils.MakePasswordList(ctx))
|
|
|
|
acct, err := accman.ImportPreSaleKey(keyJson, passphrase)
|
|
if err != nil {
|
|
utils.Fatalf("%v", err)
|
|
}
|
|
fmt.Printf("Address: {%x}\n", acct.Address)
|
|
}
|
|
|
|
func accountImport(ctx *cli.Context) {
|
|
keyfile := ctx.Args().First()
|
|
if len(keyfile) == 0 {
|
|
utils.Fatalf("keyfile must be given as argument")
|
|
}
|
|
key, err := crypto.LoadECDSA(keyfile)
|
|
if err != nil {
|
|
utils.Fatalf("keyfile must be given as argument")
|
|
}
|
|
accman := utils.MakeAccountManager(ctx)
|
|
passphrase := utils.GetPassPhrase("Your new account is locked with a password. Please give a password. Do not forget this password.", true, 0, utils.MakePasswordList(ctx))
|
|
acct, err := accman.ImportECDSA(key, passphrase)
|
|
if err != nil {
|
|
utils.Fatalf("Could not create the account: %v", err)
|
|
}
|
|
fmt.Printf("Address: {%x}\n", acct.Address)
|
|
}
|