diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-01 20:20:55 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-01 20:20:55 +0800 |
| commit | 0a8801082676d64f904cbb5b62c1159e0bbd7788 (patch) | |
| tree | 05e9c4ea80d5e01cca53d583318f43606418a19e /ethchain/keypair.go | |
| parent | 5f49a659c36dbfb8c330ddc3d4565c19a9a936b5 (diff) | |
| parent | 7277c420479239fbea78417e42c43ee0162c2728 (diff) | |
| download | go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.gz go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.bz2 go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.lz go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.xz go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.zst go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.zip | |
Merge conflicts
Diffstat (limited to 'ethchain/keypair.go')
| -rw-r--r-- | ethchain/keypair.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ethchain/keypair.go b/ethchain/keypair.go index 9fdc95972..9daaedbee 100644 --- a/ethchain/keypair.go +++ b/ethchain/keypair.go @@ -34,6 +34,7 @@ func (k *KeyPair) Account() *Account { // Create transaction, creates a new and signed transaction, ready for processing func (k *KeyPair) CreateTx(receiver []byte, value *big.Int, data []string) *Transaction { + /* TODO tx := NewTransaction(receiver, value, data) tx.Nonce = k.account.Nonce @@ -41,6 +42,8 @@ func (k *KeyPair) CreateTx(receiver []byte, value *big.Int, data []string) *Tran tx.Sign(k.PrivateKey) return tx + */ + return nil } func (k *KeyPair) RlpEncode() []byte { |