Skip to content

Commit e097efe

Browse files
incizzleincizzle
committed
update to latest version
1 parent 2b3ef77 commit e097efe

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

‎cmd/caplin/caplincli/config.go

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package caplincli
22

33
import (
4+
"crypto/rand"
45
"errors"
56
"fmt"
67
"os"
78
"strings"
89
"time"
910

1011
"github.com/ledgerwatch/erigon-lib/common/datadir"
12+
"github.com/ledgerwatch/erigon-lib/common/hexutility"
1113
"github.com/ledgerwatch/erigon/cl/clparams"
1214
"github.com/ledgerwatch/erigon/cl/phase1/core/state"
1315
"github.com/ledgerwatch/erigon/cmd/caplin/caplinflags"
@@ -121,11 +123,20 @@ func ObtainJwtSecret(ctx *cli.Context) ([]byte, error) {
121123

122124
data, err := os.ReadFile(path)
123125
if err != nil {
124-
return nil, err
125-
}
126-
jwtSecret := common.FromHex(strings.TrimSpace(string(data)))
127-
if len(jwtSecret) == 32 {
126+
jwtSecret := make([]byte, 32)
127+
rand.Read(jwtSecret)
128+
129+
if err := os.WriteFile(path, []byte(hexutility.Encode(jwtSecret)), 0600); err != nil {
130+
return nil, err
131+
}
132+
fmt.Println("Generated JWT secret", "path", path)
133+
128134
return jwtSecret, nil
135+
} else {
136+
jwtSecret := common.FromHex(strings.TrimSpace(string(data)))
137+
if len(jwtSecret) == 32 {
138+
return jwtSecret, nil
139+
}
129140
}
130141

131142
return nil, fmt.Errorf("Invalid JWT secret at %s, invalid size", path)

‎eth/backend.go

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package eth
1919

2020
import (
2121
"context"
22-
"crypto/rand"
2322
"errors"
2423
"fmt"
2524
"io/fs"

‎go.sum

-7
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
8484
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
8585
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
8686
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
87-
github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
8887
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
8988
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
9089
github.com/anacrolix/chansync v0.3.0 h1:lRu9tbeuw3wl+PhMu/r+JJCRu5ArFXIluOgdF0ao6/U=
@@ -182,7 +181,6 @@ github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9cop
182181
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
183182
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
184183
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
185-
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
186184
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
187185
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
188186
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -313,7 +311,6 @@ github.com/go-llsqlite/crawshaw v0.0.0-20230910110433-7e901377eb6c/go.mod h1:UdT
313311
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
314312
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
315313
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
316-
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
317314
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
318315
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
319316
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -488,8 +485,6 @@ github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+
488485
github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
489486
github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
490487
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
491-
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
492-
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
493488
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
494489
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
495490
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -641,7 +636,6 @@ github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXS
641636
github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
642637
github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
643638
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
644-
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
645639
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
646640
github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
647641
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -715,7 +709,6 @@ github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1A
715709
github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
716710
github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
717711
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
718-
github.com/pion/udp v0.1.4/go.mod h1:G8LDo56HsFwC24LIcnT4YIDU5qcB6NepqqjP0keL2us=
719712
github.com/pion/webrtc/v3 v3.1.42 h1:wJEQFIXVanptnQcHOLTuIo4AtGB2+mG2x4OhIhnITOA=
720713
github.com/pion/webrtc/v3 v3.1.42/go.mod h1:ffD9DulDrPxyWvDPUIPAOSAWx9GUlOExiJPf7cCcMLA=
721714
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=

‎turbo/jsonrpc/eth_receipts.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@ import (
55
"context"
66
"encoding/binary"
77
"fmt"
8+
"math/big"
89

910
"github.com/RoaringBitmap/roaring"
11+
"github.com/holiman/uint256"
1012
"github.com/ledgerwatch/log/v3"
1113

1214
"github.com/ledgerwatch/erigon-lib/chain"
1315
"github.com/ledgerwatch/erigon-lib/common"
1416
libcommon "github.com/ledgerwatch/erigon-lib/common"
17+
"github.com/ledgerwatch/erigon-lib/common/hexutil"
1518
"github.com/ledgerwatch/erigon-lib/common/hexutility"
1619
"github.com/ledgerwatch/erigon-lib/kv"
1720
"github.com/ledgerwatch/erigon-lib/kv/bitmapdb"
@@ -22,7 +25,6 @@ import (
2225

2326
"github.com/ledgerwatch/erigon/consensus"
2427
"github.com/ledgerwatch/erigon/consensus/ethash"
25-
"github.com/ledgerwatch/erigon/consensus/misc"
2628
"github.com/ledgerwatch/erigon/core"
2729
"github.com/ledgerwatch/erigon/core/rawdb"
2830
"github.com/ledgerwatch/erigon/core/state"
@@ -813,7 +815,7 @@ func (api *APIImpl) GetERCBlockReceipts(ctx context.Context, to rpc.BlockNumber,
813815
if err != nil {
814816
return nil, err
815817
}
816-
block, err := api.blockWithSenders(ctx, tx, hash, blockNum)
818+
block, err := api.blockWithSenders(tx, hash, blockNum)
817819
if err != nil {
818820
return nil, err
819821
}
@@ -920,7 +922,7 @@ func (api *APIImpl) GetERCTransactionReceipt(ctx context.Context, txnHash common
920922
var blockNum uint64
921923
var ok bool
922924

923-
blockNum, ok, err = api.txnLookup(ctx, tx, txnHash)
925+
blockNum, ok, err = api.txnLookup(tx, txnHash)
924926
if err != nil {
925927
return nil, err
926928
}
@@ -949,7 +951,7 @@ func (api *APIImpl) GetERCTransactionReceipt(ctx context.Context, txnHash common
949951
blockNum = *blockNumPtr
950952
}
951953

952-
block, err := api.blockByNumberWithSenders(ctx, tx, blockNum)
954+
block, err := api.blockByNumberWithSenders(tx, blockNum)
953955
if err != nil {
954956
return nil, err
955957
}
@@ -1044,7 +1046,7 @@ func queryERCTransaction(
10441046
tracer := NewOperationsTracer(ctx)
10451047
vmConfig := vm.Config{Debug: true, Tracer: tracer}
10461048
vmenv := vm.NewEVM(blockCtx, txCtx, ibs, chainConfig, vmConfig)
1047-
_, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas()).AddDataGas(msg.DataGas()), true, false /* gasBailout */)
1049+
_, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas()).AddGas(msg.Gas()), true, false /* gasBailout */)
10481050
if err == nil {
10491051
marhaledReciept["transfers"] = tracer.Results
10501052
}

0 commit comments

Comments
 (0)