Merge pull request #23050 from karalabe/1559-receipt-rpc

core, graphql, internal: expose effectiveGasPrice in receipts
This commit is contained in:
Péter Szilágyi authored and GitHub committed 2021-06-16 09:52:31 +03:00
commit ae315ef7a1
7 files changed
+42 -8

No files matched your search

+1 -1
View File
@@ -512,7 +512,7 @@ func (pool *TxPool) Pending(enforceTips bool) (map[common.Address]types.Transact
// If the miner requests tip enforcement, cap the lists now
if enforceTips && !pool.locals.contains(addr) {
for i, tx := range txs {
if tx.EffectiveTipIntCmp(pool.gasPrice, pool.priced.urgent.baseFee) < 0 {
if tx.EffectiveGasTipIntCmp(pool.gasPrice, pool.priced.urgent.baseFee) < 0 {
txs = txs[:i]
break
}
+2 -2
View File
@@ -356,8 +356,8 @@ func (tx *Transaction) EffectiveGasTipCmp(other *Transaction, baseFee *big.Int)
return tx.EffectiveGasTipValue(baseFee).Cmp(other.EffectiveGasTipValue(baseFee))
}
// EffectiveTipIntCmp compares the effective gasTipCap of a transaction to the given gasTipCap.
func (tx *Transaction) EffectiveTipIntCmp(other *big.Int, baseFee *big.Int) int {
// EffectiveGasTipIntCmp compares the effective gasTipCap of a transaction to the given gasTipCap.
func (tx *Transaction) EffectiveGasTipIntCmp(other *big.Int, baseFee *big.Int) int {
if baseFee == nil {
return tx.GasTipCapIntCmp(other)
}
+15
View File
@@ -236,6 +236,21 @@ func (t *Transaction) GasPrice(ctx context.Context) (hexutil.Big, error) {
}
}
func (t *Transaction) EffectiveGasPrice(ctx context.Context) (*hexutil.Big, error) {
tx, err := t.resolve(ctx)
if err != nil || tx == nil {
return nil, err
}
header, err := t.block.resolveHeader(ctx)
if err != nil || header == nil {
return nil, err
}
if header.BaseFee == nil {
return (*hexutil.Big)(tx.GasPrice()), nil
}
return (*hexutil.Big)(math.BigMin(new(big.Int).Add(tx.GasTipCap(), header.BaseFee), tx.GasFeeCap())), nil
}
func (t *Transaction) MaxFeePerGas(ctx context.Context) (*hexutil.Big, error) {
tx, err := t.resolve(ctx)
if err != nil || tx == nil {
+7
View File
@@ -118,6 +118,13 @@ const schema string = `
# this transaction. If the transaction has not yet been mined, this field
# will be null.
cumulativeGasUsed: Long
# EffectiveGasPrice is actual value per gas deducted from the sender's
# account. Before EIP-1559, this is equal to the transaction's gas price.
# After EIP-1559, it is baseFeePerGas + min(maxFeePerGas - baseFeePerGas,
# maxPriorityFeePerGas). Legacy transactions and EIP-2930 transactions are
# coerced into the EIP-1559 format by setting both maxFeePerGas and
# maxPriorityFeePerGas as the transaction's gas price.
effectiveGasPrice: BigInt
# CreatedContract is the account that was created by a contract creation
# transaction. If the transaction was not a contract creation transaction,
# or it has not yet been mined, this field will be null.
+11 -1
View File
@@ -1561,7 +1561,17 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
"logsBloom": receipt.Bloom,
"type": hexutil.Uint(tx.Type()),
}
// Assign the effective gas price paid
if !s.b.ChainConfig().IsLondon(bigblock) {
fields["effectiveGasPrice"] = hexutil.Uint64(tx.GasPrice().Uint64())
} else {
header, err := s.b.HeaderByHash(ctx, blockHash)
if err != nil {
return nil, err
}
gasPrice := new(big.Int).Add(header.BaseFee, tx.EffectiveGasTipValue(header.BaseFee))
fields["effectiveGasPrice"] = hexutil.Uint64(gasPrice.Uint64())
}
// Assign receipt status or post state.
if len(receipt.PostState) > 0 {
fields["root"] = hexutil.Bytes(receipt.PostState)
+3 -3
View File
@@ -1,7 +1,7 @@
// Code generated by go-bindata. DO NOT EDIT.
// sources:
// bignumber.js (17.314kB)
// web3.js (401.667kB)
// web3.js (401.802kB)
package deps
@@ -90,7 +90,7 @@ func bignumberJs() (*asset, error) {
return a, nil
}
var _web3Js = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x6b\x7b\x13\x39\xd2\x38\x0e\xbf\xcf\xa7\x10\x7e\xee\x07\xdb\xc4\xd8\x39\x0d\xc3\x38\x93\x61\x43\x60\x86\xec\x0d\x84\x0b\xc8\xce\xee\x9d\xcd\x72\xb5\xdd\xb2\xdd\x43\xbb\xdb\xbf\xee\x76\x0e\x43\xf2\xdd\xff\x97\x4a\xa7\xd2\xa1\x0f\x4e\xc2\x9c\x36\x79\x01\x6e\xa9\x74\x2a\x95\x4a\xa5\x52\xa9\x2a\xa3\xff\x6f\x19\x65\x74\xaf\x33\x59\x26\xe3\x22\x4a\x13\x42\x3b\x45\x2f\xe9\x65\xdd\x2f\x2a\x25\xef\xa4\xbd\x65\xf7\x4b\x34\xe9\x3c\x48\x4e\xd2\x53\xfe\xab\x80\x5f\x67\x41\x46\x82\xbd\xe2\x72\x41\xd3\x09\x91\x75\xed\xb5\x64\xd1\xd6\xc3\x87\x22\x71\x97\x95\x59\x3e\x7c\x18\x74\x33\x5a\x2c\xb3\x84\x04\x9d\xb4\xf7\x60\xa3\xcb\xd2\x23\x99\x16\x89\x34\x56\xeb\x64\x2f\xa1\xe7\xe4\x65\x96\xa5\x59\xa7\x75\x10\x24\x49\x5a\x90\x49\x94\x84\x64\x9e\x86\xcb\x98\x92\x76\x6b\x3d\x5d\x6f\xb5\x5b\xdd\xdd\x62\x96\xa5\xe7\x64\xd2\x1f\xa7\x21\xdd\x6b\xbd\x39\x7a\x71\xfc\xfa\xe5\xa7\xb7\x47\x1f\x3f\xfd\x78\x74\xfc\xf6\x45\xab\x37\xb9\x66\xf5\xc5\x7b\xac\xef\x7b\x5f\xe8\xc5\x22\xcd\x8a\x7c\xf8\xe5\xfa\x7a\x97\x8d\xe1\x64\xe3\xb4\x3f\x0e\xe2\xb8\x13\xf7\x45\x56\x4f\xf6\xbe\x43\xf9\x00\x93\x3d\x00\xdc\x3c\x3d\xa1\xa7\xbb\xa2\xab\x79\x27\x79\x96\x0c\x69\xf7\xba\x17\xf7\x74\x49\xda\xe3\xb8\xbb\x16\x50\xac\x49\x99\x09\xbd\x88\x1a\xe1\x6a\x92\x66\x1d\x06\x9d\xee\x6d\xec\xa6\xdf\x67\xfd\x98\x26\xd3\x62\xb6\x9b\xae\xaf\x77\xf3\x4e\xc6\x10\xaf\xba\x71\xdd\xed\x7c\xd9\x1c\x9e\xa8\x2e\x8b\x2a\x7a\x1c\x4b\x3d\xd1\x76\xf7\xcb\x1a\x4f\x90\x9d\xd9\x3b\x59\x23\xe4\xcb\x1a\x21\x84\xb4\xc6\x69\x92\x17\x41\x52\xb4\x86\xa4\xc8\x96\xb4\xc7\x53\xa3\x64\xb1\x2c\xf2\xd6\x90\x9c\xc0\xb7\x84\x86\xbc\x24\x98\xd3\xd6\x90\xb4\x3e\xa5\xe7\x09\xcd\x5a\x3d\x9d\xc3\x46\xc7\x72\x82\x30\xcc\x68\x9e\xb7\x44\xce\x35\xfc\x7f\x2a\xaa\x96\xc5\xe1\x7f\x91\x96\x2e\x8b\xfa\xf6\xd2\x4f\xa8\x88\xd1\xde\xe8\xb2\xa0\xf9\xf6\x96\xbf\x3d\x09\xa4\x30\xbd\x46\xc8\x75\xef\x4e\x10\x70\xa3\xfe\xa8\xe1\x20\xec\x35\x43\xc0\xca\xa8\xfe\xa3\x0e\x7d\x9c\x26\x05\x4d\x8a\x5b\x0f\xfe\x4f\x39\xef\x6c\xc6\xfe\x30\xd3\x3e\x09\xe2\xfc\xb7\x1b\x7a\x46\x73\x9a\x9d\xf9\x56\xfd\x1f\x7d\xd2\xf2\xe5\xe8\x3d\x9d\x46\x79\x91\x05\xff\x05\x93\xd7\xab\xaa\x83\x9e\x1f\xdd\x8a\xef\x17\x59\x90\xe4\x13\x2f\xeb\xfb\xb3\xe0\x20\xb3\x48\x61\x75\x24\xe4\xb4\xf8\x50\x4d\x52\x77\x86\x0b\xbb\xe9\xdf\xa4\xd1\xaf\x3c\x01\x41\x13\xc4\x57\x55\xb0\xc8\xa2\x79\x90\x5d\x7a\xfb\x91\xa6\x71\xed\xe4\xed\x8b\xb6\xfe\xbc\x28\x34\xf7\xe0\xca\x6a\xca\x90\x70\x50\xba\x8d\xff\x91\x90\xe0\xed\x7d\x18\xe5\xe9\x79\x72\x8b\x9e\x07\x49\x9a\x5c\xce\xd3\x65\xbe\x42\xd7\xa3\x24\xa4\x17\x34\x34\xf6\xae\x3b\x9b\x58\x5d\x39\xea\x8e\x59\xfb\x79\x94\xdc\x86\x71\xef\x2f\x01\x13\x2f\x93\x90\x86\x2d\x0b\x4d\xf4\x8c\x11\xc2\x5f\x00\x47\xa3\x28\x0c\x9b\xe1\xe8\x66\xf5\x9f\x05\xf1\xd2\xdb\xfd\x65\x94\x14\x5b\xdf\x3c\xa9\x9e\x82\xb7\xf4\xfc\x79\xf4\x3b\x22\xff\x56\x6b\xee\x60\x16\x24\xd3\xdf\x93\x74\xee\x84\x72\x4a\xea\x46\x52\x7d\x25\xd5\x78\x31\xf3\x8e\xef\x46\xb5\x08\x5a\x3b\x5d\x5b\xbb\xee\x7d\xb9\x3e\xed\x6d\xfd\x6e\x87\xfe\xbf\xd0\x99\xf7\x77\x92\x1d\x27\xcb\x24\xbc\x31\xa9\xdc\x7a\xe3\xba\x3f\xf6\xfe\xb9\x8f\xbd\xf7\x87\xbe\x3f\xf2\x99\xc3\x3b\x78\x71\x5e\xf8\xa3\x49\x9b\x5f\x77\x33\xd7\x7b\xd5\xf6\x9d\xed\x55\xab\xce\xfb\x24\x4b\xe7\xb7\x9c\xf6\x22\xbd\xe5\x51\xf3\x76\x02\xdf\xef\xbb\x6e\xfe\x08\xf8\x8b\x92\x30\xca\xe8\xb8\x38\xf4\xee\x99\x2b\xf4\xe4\x76\x13\x11\x8d\x83\xc5\xc7\xdf\x75\x32\xfc\x98\x6c\x76\xda\xa5\x8b\x34\x8f\xaa\x0e\xea\x8b\xe0\x32\x18\xc5\xd4\x14\x0a\x7e\x17\xae\x54\x46\x73\x77\x72\xfc\xba\x1d\x0d\xec\xcb\xf1\xbe\x30\xf1\xf9\xdb\x9f\x64\xee\x04\x49\x25\x75\x37\xa3\xb3\xdf\x01\xfd\x7f\x58\xac\xdf\xc5\xf9\xf1\xc6\x7c\xf2\x6b\x63\xdd\x66\x7a\xf7\x68\x6f\x88\xf6\x5b\x6f\x5c\x5f\x7b\x66\x0f\x3d\x5b\x5a\x95\x1c\xb7\xd3\x44\x8e\x03\xe3\x0d\xb2\x27\x2d\x1c\x3a\xed\xfe\x60\x92\x66\xf3\xa0\x28\x68\x96\xb7\xbb\xbb\x00\xf0\x21\x8d\xa3\x30\x2a\x2e\x3f\x5e\x2e\xa8\x09\xcb\xda\x67\x50\x6b\x83\x47\x8f\xd6\xc8\x23\x03\x52\xe8\xdc\x49\x94\x93\x80\x2c\xb2\x34\x65\xc0\xa4\x98\x05\x05\xc9\xe8\x82\x1d\xb2\x92\x22\x27\x62\xee\x08\xcb\x64\x35\x1c\x16\x64\x1e\x14\xe3\x19\xcd\x87\xec\x53\x64\xa3\x9f\x27\xa7\xf8\x63\xc7\xf8\x3a\x35\x33\xb7\xad\xef\xd3\x93\x27\xa7\x27\xa7\x3d\xd2\xef\xf7\xd7\xc8\xa3\x81\x33\x36\xd9\xe3\x3d\xa2\xac\x69\x3a\x5d\x31\xc5\xc5\x2c\xca\xfb\x9f\x60\x61\xfc\x28\x11\xc4\x00\xfb\x1c\x5d\x87\x2c\xe3\x30\x29\x76\x11\x30\xdf\xb7\x7d\xd0\x47\x90\x23\x9a\xdb\x5d\xbb\xde\x5d\x5b\xf3\xf4\xa3\xbf\xc8\xd2\x82\x63\x6d\x8f\x24\xf4\xdc\xe8\x6b\xe7\xcb\x75\x77\xb7\xba\x54\x1f\xa4\x97\x6c\x39\x2e\x52\xd6\xb8\x07\xb6\xae\xdd\x7e\x94\x8b\x39\xd7\x08\x61\xe4\x28\x91\x22\xec\x5a\x1e\x3c\x60\x89\x7d\x98\xb7\xce\x40\x60\xbb\xf3\xef\x93\xce\xc9\xc6\xe3\xef\x4e\x1f\x75\xff\x7d\xda\x7d\x36\xe8\xf2\x71\x9a\x07\x87\xd2\x6e\x5d\xf7\xbe\xb4\x30\x29\xb6\x86\xdf\xf5\x5a\x9c\xde\x5a\xc3\xcd\x9d\xeb\xd3\xde\x37\xbf\x33\x79\x3f\x4f\xd3\xb8\x86\xb6\x47\x0c\xa4\x84\xb0\x59\x9e\xfc\x9f\x53\x29\xfc\xda\xd1\x3f\x4f\x51\xf2\x36\xfe\xa8\x23\x63\xe8\xd9\x4d\x69\x98\x15\x5e\x85\x88\x39\xbc\x4d\xc1\x2c\x75\x45\xf2\Line truncated
var _web3Js = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x6b\x7b\x13\x39\xd2\x38\x0e\xbf\xcf\xa7\x50\xfc\xdc\x0f\xb6\x89\xb1\x73\x60\x18\xc6\x99\x0c\x1b\x02\x33\x64\x6f\x20\x5c\x40\x76\x76\xef\x6c\x96\xab\xed\x96\xed\x1e\xda\xdd\xfe\x75\xb7\x73\x18\x92\xef\xfe\xbf\x54\x3a\x95\x0e\x7d\x70\x12\xe6\xb4\xc9\x0b\x70\x4b\xa5\x53\xa9\x54\x2a\x95\x4a\x55\x19\xfd\x7f\xcb\x28\xa3\x7b\x9d\xc9\x32\x19\x17\x51\x9a\x10\xda\x29\x7a\x49\x2f\xeb\x7e\x51\x29\x79\x27\xed\x2d\xbb\x5f\xa2\x49\x67\x3d\x39\x49\x4f\xf9\xaf\x02\x7e\x9d\x05\x19\x09\xf6\x8a\xcb\x05\x4d\x27\x44\xd6\xb5\xd7\x92\x45\x5b\x0f\x1e\x88\xc4\x5d\x56\x66\xf9\xe0\x41\xd0\xcd\x68\xb1\xcc\x12\x12\x74\xd2\xde\xfa\x66\x97\xa5\x47\x32\x2d\x12\x69\xac\xd6\xc9\x5e\x42\xcf\xc9\xcb\x2c\x4b\xb3\x4e\xeb\x20\x48\x92\xb4\x20\x93\x28\x09\xc9\x3c\x0d\x97\x31\x25\xed\xd6\x46\xba\xd1\x6a\xb7\xba\xbb\xc5\x2c\x4b\xcf\xc9\xa4\x3f\x4e\x43\xba\xd7\x7a\x73\xf4\xe2\xf8\xf5\xcb\x4f\x6f\x8f\x3e\x7e\xfa\xf1\xe8\xf8\xed\x8b\x56\x6f\x72\xcd\xea\x8b\xf7\x58\xdf\xf7\xbe\xd0\x8b\x45\x9a\x15\xf9\xf0\xcb\xf5\xf5\x2e\x1b\xc3\xc9\xe6\x69\x7f\x1c\xc4\x71\x27\xee\x8b\xac\x9e\xec\x7d\x87\xf2\x01\x26\x7b\x00\xb8\x75\x7a\x42\x4f\x77\x45\x57\xf3\x4e\xf2\x2c\x19\xd2\xee\x75\x2f\xee\xe9\x92\xb4\xc7\x71\x77\x2d\xa0\x58\x93\x32\x13\x7a\x11\x35\xc2\xd5\x24\xcd\x3a\x0c\x3a\xdd\xdb\xdc\x4d\xbf\xcf\xfa\x31\x4d\xa6\xc5\x6c\x37\xdd\xd8\xe8\xe6\x9d\x8c\x21\x5e\x75\xe3\xba\xdb\xf9\xb2\x35\x3c\x51\x5d\x16\x55\xf4\x38\x96\x7a\xa2\xed\xee\x97\x35\x9e\x20\x3b\xb3\x77\xb2\x46\xc8\x97\x35\x42\x08\x69\x8d\xd3\x24\x2f\x82\xa4\x68\x0d\x49\x91\x2d\x69\x8f\xa7\x46\xc9\x62\x59\xe4\xad\x21\x39\x81\x6f\x09\x0d\x79\x49\x30\xa7\xad\x21\x69\x7d\x4a\xcf\x13\x9a\xb5\x7a\x3a\x87\x8d\x8e\xe5\x04\x61\x98\xd1\x3c\x6f\x89\x9c\x6b\xf8\xff\x54\x54\x2d\x8b\xc3\xff\x22\x2d\x5d\x16\xf5\xed\xa5\x9f\x50\x11\xa3\xbd\xd1\x65\x41\xf3\x9d\x6d\x7f\x7b\x12\x48\x61\x7a\x8d\x90\xeb\xde\x9d\x20\xe0\x46\xfd\x51\xc3\x41\xd8\x6b\x86\x80\x95\x51\xfd\x47\x1d\xfa\x38\x4d\x0a\x9a\x14\xb7\x1e\xfc\x9f\x72\xde\xd9\x8c\xfd\x61\xa6\x7d\x12\xc4\xf9\x6f\x37\xf4\x8c\xe6\x34\x3b\xf3\xad\xfa\x3f\xfa\xa4\xe5\xcb\xd1\x7b\x3a\x8d\xf2\x22\x0b\xfe\x0b\x26\xaf\x57\x55\x07\x3d\x3f\xba\x15\xdf\x2f\xb2\x20\xc9\x27\x5e\xd6\xf7\x67\xc1\x41\x66\x91\xc2\xea\x48\xc8\x69\xf1\xa1\x9a\xa4\xee\x0c\x17\x76\xd3\xbf\x49\xa3\x5f\x79\x02\x82\x26\x88\xaf\xaa\x60\x91\x45\xf3\x20\xbb\xf4\xf6\x23\x4d\xe3\xda\xc9\xdb\x17\x6d\xfd\x79\x51\x68\xee\xc1\x95\xd5\x94\x21\xe1\xa0\x74\x1b\xff\x23\x21\xc1\xdb\xfb\x30\xca\xd3\xf3\xe4\x16\x3d\x0f\x92\x34\xb9\x9c\xa7\xcb\x7c\x85\xae\x47\x49\x48\x2f\x68\x68\xec\x5d\x77\x36\xb1\xba\x72\xd4\x1d\xb3\xf6\xf3\x28\xb9\x0d\xe3\xde\x5f\x02\x26\x5e\x26\x21\x0d\x5b\x16\x9a\xe8\x19\x23\x84\xbf\x00\x8e\x46\x51\x18\x36\xc3\xd1\xcd\xea\x3f\x0b\xe2\xa5\xb7\xfb\xcb\x28\x29\xb6\xbf\x79\x52\x3d\x05\x6f\xe9\xf9\xf3\xe8\x77\x44\xfe\xad\xd6\xdc\xc1\x2c\x48\xa6\xbf\x27\xe9\xdc\x09\xe5\x94\xd4\x8d\xa4\xfa\x4a\xaa\xf1\x62\xe6\x1d\xdf\x8d\x6a\x11\xb4\x76\xba\xb6\x76\xdd\xfb\x72\x7d\xda\xdb\xfe\xdd\x0e\xfd\x7f\xa1\x33\xef\xef\x24\x3b\x4e\x96\x49\x78\x63\x52\xb9\xf5\xc6\x75\x7f\xec\xfd\x73\x1f\x7b\xef\x0f\x7d\x7f\xe4\x33\x87\x77\xf0\xe2\xbc\xf0\x47\x93\x36\xbf\xee\x66\xae\xf7\xaa\x9d\x3b\xdb\xab\x56\x9d\xf7\x49\x96\xce\x6f\x39\xed\x45\x7a\xcb\xa3\xe6\xed\x04\xbe\xdf\x77\xdd\xfc\x11\xf0\x17\x25\x61\x94\xd1\x71\x71\xe8\xdd\x33\x57\xe8\xc9\xed\x26\x22\x1a\x07\x8b\x8f\xbf\xeb\x64\xf8\x31\xd9\xec\xb4\x4b\x17\x69\x1e\x55\x1d\xd4\x17\xc1\x65\x30\x8a\xa9\x29\x14\xfc\x2e\x5c\xa9\x8c\xe6\xee\xe4\xf8\x75\x3b\x1a\xd8\x97\xe3\x7d\x61\xe2\xf3\xb7\x3f\xc9\xdc\x09\x92\x4a\xea\x6e\x46\x67\xbf\x03\xfa\xff\xb0\x58\xbf\x8b\xf3\xe3\x8d\xf9\xe4\xd7\xc6\xba\xcd\xf4\xee\xd1\xde\x10\xed\xb7\xde\xb8\xbe\xf6\xcc\x1e\x7a\xb6\xb4\x2a\x39\xee\x71\x13\x39\x0e\x8c\x37\xc8\x9e\xb4\x70\xe8\xb4\xfb\x83\x49\x9a\xcd\x83\xa2\xa0\x59\xde\xee\xee\x02\xc0\x87\x34\x8e\xc2\xa8\xb8\xfc\x78\xb9\xa0\x26\x2c\x6b\x9f\x41\xad\x0d\x1e\x3e\x5c\x23\x0f\x0d\x48\xa1\x73\x27\x51\x4e\x02\xb2\xc8\xd2\x94\x01\x93\x62\x16\x14\x24\xa3\x0b\x76\xc8\x4a\x8a\x9c\x88\xb9\x23\x2c\x93\xd5\x70\x58\x90\x79\x50\x8c\x67\x34\x1f\xb2\x4f\x91\x8d\x7e\x9e\x9c\xe2\x8f\xc7\xc6\xd7\xa9\x99\xb9\x63\x7d\x9f\x9e\x3c\x39\x3d\x39\xed\x91\x7e\xbf\xbf\x46\x1e\x0e\x9c\xb1\xc9\x1e\xef\x11\x65\x4d\xd3\xe9\x8a\x29\x2e\x66\x51\xde\xff\x04\x0b\xe3\x47\x89\x20\x06\xd8\xe7\xe8\x3a\x64\x19\x87\x49\xb1\x8b\x80\xf9\xbe\xed\x83\x3e\x82\x1c\xd1\xdc\xee\xda\xf5\xee\xda\x9a\xa7\x1f\xfd\x45\x96\x16\x1c\x6b\x7b\x24\xa1\xe7\x46\x5f\x3b\x5f\xae\xbb\xbb\xd5\xa5\xfa\x20\xbd\x64\xcb\x71\x91\xb2\xc6\x3d\xb0\x75\xed\xf6\xa3\x5c\xcc\xb9\x46\x08\x23\x47\x89\x14\x61\xd7\xb2\xbe\xce\x12\xfb\x30\x6f\x9d\x81\xc0\x76\xe7\xdf\x27\x9d\x93\xcd\x47\xdf\x9d\x3e\xec\xfe\xfb\xb4\xfb\x6c\xd0\xe5\xe3\x34\x0f\x0e\xa5\xdd\xba\xee\x7d\x69\x61\x52\x6c\x0d\xbf\xeb\xb5\x38\xbd\xb5\x86\x5b\x8f\xaf\x4f\x7b\xdf\xfc\xce\xe4\xfd\x3c\x4d\xe3\x1a\xda\x1e\x31\x90\x12\xc2\x66\x79\xf2\x7f\x4e\xa5\xf0\xeb\xb1\xfe\x79\x8a\x92\x77\xf0\x47\x1d\x19\x43\xcf\x6e\x4a\xc3\xac\xf0\x2a\x44\xcc\xe1\x6d\x0a\x66\xa9\x2b\x92\Line truncated
func web3JsBytes() ([]byte, error) {
return bindataRead(
@@ -106,7 +106,7 @@ func web3Js() (*asset, error) {
}
info := bindataFileInfo{name: "web3.js", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}
a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf9, 0x89, 0xb5, 0xa2, 0x49, 0xb6, 0x9b, 0xb3, 0x1e, 0x9e, 0x8c, 0x4, 0x7e, 0x35, 0x1e, 0x68, 0x5b, 0x32, 0x15, 0x9c, 0xab, 0x52, 0x45, 0xfc, 0x3b, 0x3a, 0x73, 0x35, 0xde, 0xd9, 0x2a, 0xf6}}
a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x1, 0x32, 0x6b, 0xa6, 0x48, 0xcf, 0x60, 0x55, 0x11, 0x99, 0x68, 0x24, 0xdb, 0x89, 0x36, 0xbe, 0xaa, 0xc, 0x77, 0xc9, 0x80, 0xa8, 0xd2, 0x72, 0x9d, 0x71, 0xa8, 0xc3, 0x9a, 0x61, 0x8f, 0xaa}}
return a, nil
}
+3 -1
View File
@@ -3807,7 +3807,9 @@ var outputTransactionReceiptFormatter = function (receipt){
receipt.transactionIndex = utils.toDecimal(receipt.transactionIndex);
receipt.cumulativeGasUsed = utils.toDecimal(receipt.cumulativeGasUsed);
receipt.gasUsed = utils.toDecimal(receipt.gasUsed);
if(receipt.effectiveGasPrice !== undefined) {
receipt.effectiveGasPrice = utils.toBigNumber(receipt.effectiveGasPrice);
}
if(utils.isArray(receipt.logs)) {
receipt.logs = receipt.logs.map(function(log){
return outputLogFormatter(log);