|
|
@ -1,7 +1,9 @@ |
|
|
|
package ethpub |
|
|
|
package ethpub |
|
|
|
|
|
|
|
|
|
|
|
import ( |
|
|
|
import ( |
|
|
|
|
|
|
|
"bytes" |
|
|
|
"encoding/hex" |
|
|
|
"encoding/hex" |
|
|
|
|
|
|
|
"encoding/json" |
|
|
|
"github.com/ethereum/eth-go/ethchain" |
|
|
|
"github.com/ethereum/eth-go/ethchain" |
|
|
|
"github.com/ethereum/eth-go/ethutil" |
|
|
|
"github.com/ethereum/eth-go/ethutil" |
|
|
|
"math/big" |
|
|
|
"math/big" |
|
|
@ -81,6 +83,34 @@ func (lib *PEthereum) GetCoinBase() string { |
|
|
|
return lib.SecretToAddress(hex.EncodeToString(key)) |
|
|
|
return lib.SecretToAddress(hex.EncodeToString(key)) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (lib *PEthereum) GetTransactionsFor(address string, asJson bool) interface{} { |
|
|
|
|
|
|
|
sBlk := lib.manager.BlockChain().LastBlockHash |
|
|
|
|
|
|
|
blk := lib.manager.BlockChain().GetBlock(sBlk) |
|
|
|
|
|
|
|
addr := []byte(ethutil.FromHex(address)) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var txs []*PTx |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for ; blk != nil; blk = lib.manager.BlockChain().GetBlock(sBlk) { |
|
|
|
|
|
|
|
sBlk = blk.PrevHash |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Loop through all transactions to see if we missed any while being offline
|
|
|
|
|
|
|
|
for _, tx := range blk.Transactions() { |
|
|
|
|
|
|
|
if bytes.Compare(tx.Sender(), addr) == 0 || bytes.Compare(tx.Recipient, addr) == 0 { |
|
|
|
|
|
|
|
ethutil.Config.Log.Debugf("FOund tx: %x\n", tx) |
|
|
|
|
|
|
|
txs = append(txs, NewPTx(tx)) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if asJson { |
|
|
|
|
|
|
|
txJson, err := json.Marshal(txs) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return string(txJson) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return txs |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (lib *PEthereum) GetStorage(address, storageAddress string) string { |
|
|
|
func (lib *PEthereum) GetStorage(address, storageAddress string) string { |
|
|
|
return lib.GetStateObject(address).GetStorage(storageAddress) |
|
|
|
return lib.GetStateObject(address).GetStorage(storageAddress) |
|
|
|
} |
|
|
|
} |
|
|
@ -123,7 +153,6 @@ func GetAddressFromNameReg(stateManager *ethchain.StateManager, name string) []b |
|
|
|
|
|
|
|
|
|
|
|
return nil |
|
|
|
return nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, scriptStr string) (*PReceipt, error) { |
|
|
|
func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, scriptStr string) (*PReceipt, error) { |
|
|
|
var hash []byte |
|
|
|
var hash []byte |
|
|
|
var contractCreation bool |
|
|
|
var contractCreation bool |
|
|
|