tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added receipts for tx creation

Browse Source
This commit is contained in:
obscuren 2014-05-02 14:08:54 +02:00
parent e798f221dd
commit 1f6df0cd52
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethchain/transaction.go
View File

@ -59,6 +59,10 @@ func (tx *Transaction) IsContract() bool {
return tx.contractCreation return tx.contractCreation
} }
func (tx *Transaction) CreationAddress() []byte {
return tx.Hash()[12:]
}
func (tx *Transaction) Signature(key []byte) []byte { func (tx *Transaction) Signature(key []byte) []byte {
hash := tx.Hash() hash := tx.Hash()

16
ethpub/pub.go
View File

@ -47,15 +47,15 @@ func (lib *PEthereum) GetStateObject(address string) *PStateObject {
return NewPStateObject(nil) return NewPStateObject(nil)
} }
func (lib *PEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) { func (lib *PEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (*PReceipt, error) {
return lib.createTx(key, recipient, valueStr, gasStr, gasPriceStr, dataStr, "") return lib.createTx(key, recipient, valueStr, gasStr, gasPriceStr, dataStr, "")
} }
func (lib *PEthereum) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) (string, error) { func (lib *PEthereum) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) (*PReceipt, error) {
return lib.createTx(key, "", valueStr, gasStr, gasPriceStr, initStr, bodyStr) return lib.createTx(key, "", valueStr, gasStr, gasPriceStr, initStr, bodyStr)
} }
func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, initStr, scriptStr string) (string, error) { func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, initStr, scriptStr string) (*PReceipt, error) {
var hash []byte var hash []byte
var contractCreation bool var contractCreation bool
if len(recipient) == 0 { if len(recipient) == 0 {
@ -66,7 +66,7 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
keyPair, err := ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key))) keyPair, err := ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key)))
if err != nil { if err != nil {
return "", err return nil, err
} }
value := ethutil.Big(valueStr) value := ethutil.Big(valueStr)
@ -77,11 +77,11 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
if contractCreation { if contractCreation {
initScript, err := ethutil.Compile(initStr) initScript, err := ethutil.Compile(initStr)
if err != nil { if err != nil {
return "", err return nil, err
} }
mainScript, err := ethutil.Compile(scriptStr) mainScript, err := ethutil.Compile(scriptStr)
if err != nil { if err != nil {
return "", err return nil, err
} }
tx = ethchain.NewContractCreationTx(value, gas, gasPrice, mainScript, initScript) tx = ethchain.NewContractCreationTx(value, gas, gasPrice, mainScript, initScript)
@ -99,10 +99,10 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
lib.txPool.QueueTransaction(tx) lib.txPool.QueueTransaction(tx)
if contractCreation { if contractCreation {
ethutil.Config.Log.Infof("Contract addr %x", tx.Hash()[12:]) ethutil.Config.Log.Infof("Contract addr %x", tx.CreationAddress())
} else { } else {
ethutil.Config.Log.Infof("Tx hash %x", tx.Hash()) ethutil.Config.Log.Infof("Tx hash %x", tx.Hash())
} }
return ethutil.Hex(tx.Hash()), nil return NewPReciept(contractCreation, tx.CreationAddress(), tx.Hash(), keyPair.Address()), nil
} }

16
ethpub/types.go
View File

@ -43,6 +43,22 @@ func NewPKey(key *ethchain.KeyPair) *PKey {
return &PKey{ethutil.Hex(key.Address()), ethutil.Hex(key.PrivateKey), ethutil.Hex(key.PublicKey)} return &PKey{ethutil.Hex(key.Address()), ethutil.Hex(key.PrivateKey), ethutil.Hex(key.PublicKey)}
} }
type PReceipt struct {
CreatedContract bool
Address string
Hash string
Sender string
}
func NewPReciept(contractCreation bool, creationAddress, hash, address []byte) *PReceipt {
return &PReceipt{
contractCreation,
ethutil.Hex(creationAddress),
ethutil.Hex(hash),
ethutil.Hex(address),
}
}
/* /*
type PKeyRing struct { type PKeyRing struct {
Keys []interface{} Keys []interface{}