Skip to content

Commit 2b6855c

Browse files
mask-ppmask-pp
committed
revert the changes in blobTxMeta
1 parent 98af70f commit 2b6855c

File tree

35 files changed

+252
-253
lines changed

35 files changed

+252
-253
lines changed

‎accounts/abi/abigen/bind_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ var bindTests = []struct {
870870
contract Eventer {
871871
event SimpleEvent (
872872
address indexed Addr,
873-
bytes32 indexed Id,
873+
bytes32 indexed id,
874874
bool indexed Flag,
875875
uint Value
876876
);
@@ -907,7 +907,7 @@ var bindTests = []struct {
907907
}
908908
`,
909909
[]string{`608060405234801561001057600080fd5b5061043f806100206000396000f3006080604052600436106100615763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663528300ff8114610066578063630c31e2146100ff5780636cc6b94014610138578063c7d116dd1461015b575b600080fd5b34801561007257600080fd5b506040805160206004803580820135601f81018490048402850184019095528484526100fd94369492936024939284019190819084018382808284375050604080516020601f89358b018035918201839004830284018301909452808352979a9998810197919650918201945092508291508401838280828437509497506101829650505050505050565b005b34801561010b57600080fd5b506100fd73ffffffffffffffffffffffffffffffffffffffff60043516602435604435151560643561033c565b34801561014457600080fd5b506100fd67ffffffffffffffff1960043516610394565b34801561016757600080fd5b506100fd60043560243560010b63ffffffff604435166103d6565b806040518082805190602001908083835b602083106101b25780518252601f199092019160209182019101610193565b51815160209384036101000a6000190180199092169116179052604051919093018190038120875190955087945090928392508401908083835b6020831061020b5780518252601f1990920191602091820191016101ec565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f3281fd4f5e152dd3385df49104a3f633706e21c9e80672e88d3bcddf33101f008484604051808060200180602001838103835285818151815260200191508051906020019080838360005b8381101561029c578181015183820152602001610284565b50505050905090810190601f1680156102c95780820380516001836020036101000a031916815260200191505b50838103825284518152845160209182019186019080838360005b838110156102fc5781810151838201526020016102e4565b50505050905090810190601f1680156103295780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a35050565b60408051828152905183151591859173ffffffffffffffffffffffffffffffffffffffff8816917f1f097de4289df643bd9c11011cc61367aa12983405c021056e706eb5ba1250c8919081900360200190a450505050565b6040805167ffffffffffffffff19831680825291517fcdc4c1b1aed5524ffb4198d7a5839a34712baef5fa06884fac7559f4a5854e0a9181900360200190a250565b8063ffffffff168260010b847f3ca7f3a77e5e6e15e781850bc82e32adfa378a2a609370db24b4d0fae10da2c960405160405180910390a45050505600a165627a7a72305820468b5843bf653145bd924b323c64ef035d3dd922c170644b44d61aa666ea6eee0029`},
910-
[]string{`[{"constant":false,"inputs":[{"name":"str","type":"string"},{"name":"blob","type":"bytes"}],"name":"raiseDynamicEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"addr","type":"address"},{"name":"id","type":"bytes32"},{"name":"flag","type":"bool"},{"name":"value","type":"uint256"}],"name":"raiseSimpleEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"blob","type":"bytes24"}],"name":"raiseFixedBytesEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"number","type":"uint256"},{"name":"short","type":"int16"},{"name":"long","type":"uint32"}],"name":"raiseNodataEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"Addr","type":"address"},{"indexed":true,"name":"Id","type":"bytes32"},{"indexed":true,"name":"Flag","type":"bool"},{"indexed":false,"name":"Value","type":"uint256"}],"name":"SimpleEvent","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"Number","type":"uint256"},{"indexed":true,"name":"Short","type":"int16"},{"indexed":true,"name":"Long","type":"uint32"}],"name":"NodataEvent","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"IndexedString","type":"string"},{"indexed":true,"name":"IndexedBytes","type":"bytes"},{"indexed":false,"name":"NonIndexedString","type":"string"},{"indexed":false,"name":"NonIndexedBytes","type":"bytes"}],"name":"DynamicEvent","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"IndexedBytes","type":"bytes24"},{"indexed":false,"name":"NonIndexedBytes","type":"bytes24"}],"name":"FixedBytesEvent","type":"event"}]`},
910+
[]string{`[{"constant":false,"inputs":[{"name":"str","type":"string"},{"name":"blob","type":"bytes"}],"name":"raiseDynamicEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"addr","type":"address"},{"name":"id","type":"bytes32"},{"name":"flag","type":"bool"},{"name":"value","type":"uint256"}],"name":"raiseSimpleEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"blob","type":"bytes24"}],"name":"raiseFixedBytesEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"number","type":"uint256"},{"name":"short","type":"int16"},{"name":"long","type":"uint32"}],"name":"raiseNodataEvent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"Addr","type":"address"},{"indexed":true,"name":"id","type":"bytes32"},{"indexed":true,"name":"Flag","type":"bool"},{"indexed":false,"name":"Value","type":"uint256"}],"name":"SimpleEvent","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"Number","type":"uint256"},{"indexed":true,"name":"Short","type":"int16"},{"indexed":true,"name":"Long","type":"uint32"}],"name":"NodataEvent","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"IndexedString","type":"string"},{"indexed":true,"name":"IndexedBytes","type":"bytes"},{"indexed":false,"name":"NonIndexedString","type":"string"},{"indexed":false,"name":"NonIndexedBytes","type":"bytes"}],"name":"DynamicEvent","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"IndexedBytes","type":"bytes24"},{"indexed":false,"name":"NonIndexedBytes","type":"bytes24"}],"name":"FixedBytesEvent","type":"event"}]`},
911911
`
912912
"math/big"
913913
"time"

‎accounts/usbwallet/ledger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const (
6060
ledgerP1ContTransactionData ledgerParam1 = 0x80 // Subsequent transaction data block for signing
6161
ledgerP2DiscardAddressChainCode ledgerParam2 = 0x00 // Do not return the chain code along with the address
6262

63-
ledgerEip155Size int = 3 // Size of the EIP-155 chain_id,r,s in unsigned transactions
63+
ledgerEip155Size int = 3 // size of the EIP-155 chain_id,r,s in unsigned transactions
6464
)
6565

6666
// errLedgerReplyInvalidHeader is the error message returned by a Ledger data exchange

‎accounts/usbwallet/trezor/messages-ethereum.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎beacon/types/exec_payload.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func convertPayload[T payloadType](payload T, parentRoot *zrntcommon.Root, reque
7474
}
7575

7676
func convertCapellaHeader(payload *capella.ExecutionPayload, h *types.Header) {
77-
// note: h.TxHash is set in convertTransactions
77+
// note: h.hash is set in convertTransactions
7878
h.ParentHash = common.Hash(payload.ParentHash)
7979
h.UncleHash = types.EmptyUncleHash
8080
h.Coinbase = common.Address(payload.FeeRecipient)
@@ -93,7 +93,7 @@ func convertCapellaHeader(payload *capella.ExecutionPayload, h *types.Header) {
9393
}
9494

9595
func convertDenebHeader(payload *deneb.ExecutionPayload, parentRoot common.Hash, h *types.Header) {
96-
// note: h.TxHash is set in convertTransactions
96+
// note: h.hash is set in convertTransactions
9797
h.ParentHash = common.Hash(payload.ParentHash)
9898
h.UncleHash = types.EmptyUncleHash
9999
h.Coinbase = common.Address(payload.FeeRecipient)

‎cmd/devp2p/internal/ethtest/suite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ does not propagate them.`)
666666
s.chain.IncNonce(from, 1)
667667

668668
inners := []*types.DynamicFeeTx{
669-
// Nonce already used
669+
// nonce already used
670670
{
671671
ChainID: s.chain.config.ChainID,
672672
Nonce: nonce - 1,

‎cmd/utils/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ var (
489489
}
490490
CacheLogSizeFlag = &cli.IntFlag{
491491
Name: "cache.blocklogs",
492-
Usage: "Size (in number of blocks) of the log cache for filtering",
492+
Usage: "size (in number of blocks) of the log cache for filtering",
493493
Category: flags.PerfCategory,
494494
Value: ethconfig.Defaults.FilterLogCacheSize,
495495
}

‎core/blockchain.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ const (
130130
//
131131
// - Version 4
132132
// The following incompatible database changes were added:
133-
// * the `BlockNumber`, `TxHash`, `TxIndex`, `BlockHash` and `Index` fields of log are deleted
133+
// * the `BlockNumber`, `hash`, `TxIndex`, `BlockHash` and `Index` fields of log are deleted
134134
// * the `Bloom` field of receipt is deleted
135135
// * the `BlockIndex` and `TxIndex` fields of txlookup are deleted
136136
//
137137
// - Version 5
138138
// The following incompatible database changes were added:
139-
// * the `TxHash`, `GasCost`, and `ContractAddress` fields are no longer stored for a receipt
140-
// * the `TxHash`, `GasCost`, and `ContractAddress` fields are computed by looking up the
139+
// * the `hash`, `GasCost`, and `ContractAddress` fields are no longer stored for a receipt
140+
// * the `hash`, `GasCost`, and `ContractAddress` fields are computed by looking up the
141141
// receipts' corresponding block
142142
//
143143
// - Version 6

‎core/rawdb/accessors_chain_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ func TestDeriveLogFields(t *testing.T) {
858858
t.Errorf("receipts[%d].Logs[%d].BlockTimestamp = %d, want %d", i, j, receipts[i].Logs[j].BlockTimestamp, 12)
859859
}
860860
if receipts[i].Logs[j].TxHash != txs[i].Hash() {
861-
t.Errorf("receipts[%d].Logs[%d].TxHash = %s, want %s", i, j, receipts[i].Logs[j].TxHash.String(), txs[i].Hash().String())
861+
t.Errorf("receipts[%d].Logs[%d].hash = %s, want %s", i, j, receipts[i].Logs[j].TxHash.String(), txs[i].Hash().String())
862862
}
863863
if receipts[i].Logs[j].TxIndex != uint(i) {
864864
t.Errorf("receipts[%d].Logs[%d].TransactionIndex = %d, want %d", i, j, receipts[i].Logs[j].TxIndex, i)

‎core/rawdb/database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
583583
total += ancient.size()
584584
}
585585
table := tablewriter.NewWriter(os.Stdout)
586-
table.SetHeader([]string{"Database", "Category", "Size", "Items"})
586+
table.SetHeader([]string{"Database", "Category", "size", "Items"})
587587
table.SetFooter([]string{"", "Total", total.String(), " "})
588588
table.AppendBulk(stats)
589589
table.Render()

‎core/state_transition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func ApplyMessage(evm *vm.EVM, msg *Message, gp *GasPool) (*ExecutionResult, err
218218
// state. The state transitioning model does all the necessary work to work out a valid new
219219
// state root.
220220
//
221-
// 1. Nonce handling
221+
// 1. nonce handling
222222
// 2. Pre pay gas
223223
// 3. Create a new state object if the recipient is nil
224224
// 4. Value transfer

0 commit comments

Comments
 (0)