diff --git a/go.mod b/go.mod index 5d50a31..5e2127e 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/filecoin-project/go-f3 v0.2.0 github.com/filecoin-project/go-jsonrpc v0.6.0 github.com/filecoin-project/go-state-types v0.14.0 - github.com/filecoin-project/lotus v1.28.3 + github.com/filecoin-project/lotus v1.29.1 github.com/filecoin-project/specs-actors/v8 v8.0.1 github.com/google/uuid v1.6.0 github.com/ipfs/go-block-format v0.2.0 @@ -22,7 +22,7 @@ require ( github.com/multiformats/go-multihash v0.2.3 github.com/orcaman/concurrent-map v1.0.0 github.com/stretchr/testify v1.9.0 - github.com/zondax/rosetta-filecoin-lib v1.2803.0 + github.com/zondax/rosetta-filecoin-lib v1.2901.0 gotest.tools v2.2.0+incompatible ) diff --git a/go.sum b/go.sum index 55b9f15..55dcd39 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,9 @@ github.com/filecoin-project/go-bitfield v0.2.4 h1:uZ7MeE+XfM5lqrHJZ93OnhQKc/rveW github.com/filecoin-project/go-bitfield v0.2.4/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM= github.com/filecoin-project/go-cbor-util v0.0.1 h1:E1LYZYTtjfAQwCReho0VXvbu8t3CYAVPiMx8EiV/VAs= github.com/filecoin-project/go-cbor-util v0.0.1/go.mod h1:pqTiPHobNkOVM5thSRsHYjyQfq7O5QSCMhvuu9JoDlg= -github.com/filecoin-project/go-commp-utils v0.1.3 h1:rTxbkNXZU7FLgdkBk8RsQIEOuPONHykEoX3xGk41Fkw= -github.com/filecoin-project/go-commp-utils v0.1.3/go.mod h1:3ENlD1pZySaUout0p9ANQrY3fDFoXdqyX04J+dWpK30= +github.com/filecoin-project/go-commp-utils v0.1.4 h1:/WSsrAb0xupo+aRWRyD80lRUXAXJvYoTgDQS1pYZ1Mk= +github.com/filecoin-project/go-commp-utils/v2 v2.1.0 h1:KWNRalUp2bhN1SW7STsJS2AHs9mnfGKk9LnQgzDe+gI= +github.com/filecoin-project/go-commp-utils/v2 v2.1.0/go.mod h1:NbxJYlhxtWaNhlVCj/gysLNu26kYII83IV5iNrAO9iI= github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03/go.mod h1:+viYnvGtUTgJRdy6oaeF4MTFKAfatX071MPDPBL11EQ= github.com/filecoin-project/go-crypto v0.1.0 h1:Pob2MphoipMbe/ksxZOMcQvmBHAd3sI/WEqcbpIsGI0= github.com/filecoin-project/go-crypto v0.1.0/go.mod h1:K9UFXvvoyAVvB+0Le7oGlKiT9mgA5FHOJdYQXEE8IhI= @@ -105,6 +106,8 @@ github.com/filecoin-project/go-f3 v0.2.0 h1:Gis44+hOrDjSUEw3IDmU7CudNILi5e+bb1pg github.com/filecoin-project/go-f3 v0.2.0/go.mod h1:43fBLX0iX0+Nnw4Z91wSrdfDYAd6YEDexy7GcLnIJtk= github.com/filecoin-project/go-fil-commcid v0.1.0 h1:3R4ds1A9r6cr8mvZBfMYxTS88OqLYEo6roi+GiIeOh8= github.com/filecoin-project/go-fil-commcid v0.1.0/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ= +github.com/filecoin-project/go-fil-commp-hashhash v0.2.0 h1:HYIUugzjq78YvV3vC6rL95+SfC/aSTVSnZSZiDV5pCk= +github.com/filecoin-project/go-fil-commp-hashhash v0.2.0/go.mod h1:VH3fAFOru4yyWar4626IoS5+VGE8SfZiBODJLUigEo4= github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3LPEk0OrS/ytIBM= github.com/filecoin-project/go-hamt-ipld v0.1.5/go.mod h1:6Is+ONR5Cd5R6XZoCse1CWaXZc0Hdb/JeX+EQCQzX24= github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 h1:b3UDemBYN2HNfk3KOXNuxgTTxlWi3xVvbQP0IT38fvM= @@ -121,8 +124,8 @@ github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psS github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-state-types v0.14.0 h1:JFw8r/LA0/Hvu865Yn2Gz3R5e2woItKeHTgbT4VsXoU= github.com/filecoin-project/go-state-types v0.14.0/go.mod h1:cDbxwjbmVtV+uNi5D/cFtxKlsRqibnQNlz7xQA1EqYg= -github.com/filecoin-project/lotus v1.28.3 h1:FGenHuTHBT8TYhzMyA75b2GeLGY0Wqbem/D5YpSkNSg= -github.com/filecoin-project/lotus v1.28.3/go.mod h1:sOiMD6njCo4G8Oaeo/XSzPjQiePcLkIcyPwPNNoj2Cg= +github.com/filecoin-project/lotus v1.29.1 h1:qRbkWeOBOMJJStyAOdkMqkAWyYyyhc83AGRULFCTKV0= +github.com/filecoin-project/lotus v1.29.1/go.mod h1:OKCCLyiH1BQAdnF4Finyg+8C9joijousxdFeEYCeXNo= github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= github.com/filecoin-project/specs-actors v0.9.15-0.20220514164640-94e0d5e123bd/go.mod h1:pjGEe3QlWtK20ju/aFRsiArbMX6Cn8rqEhhsiCM9xYE= github.com/filecoin-project/specs-actors v0.9.15 h1:3VpKP5/KaDUHQKAMOg4s35g/syDaEBueKLws0vbsjMc= @@ -710,8 +713,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zondax/rosetta-filecoin-lib v1.2803.0 h1:+hyMtCetMGYUInb7LZve0YxxPJ+n1A3OZIrLqFYeY5E= -github.com/zondax/rosetta-filecoin-lib v1.2803.0/go.mod h1:UJGKqWmPA+vemaVAR5wMYUYRaCXgcivqapJAFl93vAU= +github.com/zondax/rosetta-filecoin-lib v1.2901.0 h1:EOOJC4/EE6/rMAu5TiQoTbD0xSaiRoGmo8p2/ugFyXM= +github.com/zondax/rosetta-filecoin-lib v1.2901.0/go.mod h1:XzPpAQK8q+jerxK1gIFyBIzc/I9AW949K8d6kfYZNzQ= gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b h1:CzigHMRySiX3drau9C6Q5CAbNIApmLdat5jPMqChvDA= gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b/go.mod h1:/y/V339mxv2sZmYYR64O07VuCpdNZqCTwO8ZcouTMI8= gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 h1:qwDnMxjkyLmAFgcfgTnfJrmYKWhHnci3GjDqcZp1M3Q= diff --git a/rosetta/services/mocks/fullnode_mock.go b/rosetta/services/mocks/fullnode_mock.go index e667eee..ac43040 100644 --- a/rosetta/services/mocks/fullnode_mock.go +++ b/rosetta/services/mocks/fullnode_mock.go @@ -2008,6 +2008,36 @@ func (_m *FullNode) EthTraceBlock(ctx context.Context, blkNum string) ([]*ethtyp return r0, r1 } +// EthTraceFilter provides a mock function with given fields: ctx, filter +func (_m *FullNode) EthTraceFilter(ctx context.Context, filter ethtypes.EthTraceFilterCriteria) ([]*ethtypes.EthTraceFilterResult, error) { + ret := _m.Called(ctx, filter) + + if len(ret) == 0 { + panic("no return value specified for EthTraceFilter") + } + + var r0 []*ethtypes.EthTraceFilterResult + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, ethtypes.EthTraceFilterCriteria) ([]*ethtypes.EthTraceFilterResult, error)); ok { + return rf(ctx, filter) + } + if rf, ok := ret.Get(0).(func(context.Context, ethtypes.EthTraceFilterCriteria) []*ethtypes.EthTraceFilterResult); ok { + r0 = rf(ctx, filter) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]*ethtypes.EthTraceFilterResult) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, ethtypes.EthTraceFilterCriteria) error); ok { + r1 = rf(ctx, filter) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // EthTraceReplayBlockTransactions provides a mock function with given fields: ctx, blkNum, traceTypes func (_m *FullNode) EthTraceReplayBlockTransactions(ctx context.Context, blkNum string, traceTypes []string) ([]*ethtypes.EthTraceReplayBlockTransaction, error) { ret := _m.Called(ctx, blkNum, traceTypes) @@ -2272,9 +2302,9 @@ func (_m *FullNode) F3Participate(ctx context.Context, minerID address.Address, return r0, r1 } -// FilecoinAddressToEthAddress provides a mock function with given fields: ctx, filecoinAddress -func (_m *FullNode) FilecoinAddressToEthAddress(ctx context.Context, filecoinAddress address.Address) (ethtypes.EthAddress, error) { - ret := _m.Called(ctx, filecoinAddress) +// FilecoinAddressToEthAddress provides a mock function with given fields: ctx, p +func (_m *FullNode) FilecoinAddressToEthAddress(ctx context.Context, p jsonrpc.RawParams) (ethtypes.EthAddress, error) { + ret := _m.Called(ctx, p) if len(ret) == 0 { panic("no return value specified for FilecoinAddressToEthAddress") @@ -2282,19 +2312,19 @@ func (_m *FullNode) FilecoinAddressToEthAddress(ctx context.Context, filecoinAdd var r0 ethtypes.EthAddress var r1 error - if rf, ok := ret.Get(0).(func(context.Context, address.Address) (ethtypes.EthAddress, error)); ok { - return rf(ctx, filecoinAddress) + if rf, ok := ret.Get(0).(func(context.Context, jsonrpc.RawParams) (ethtypes.EthAddress, error)); ok { + return rf(ctx, p) } - if rf, ok := ret.Get(0).(func(context.Context, address.Address) ethtypes.EthAddress); ok { - r0 = rf(ctx, filecoinAddress) + if rf, ok := ret.Get(0).(func(context.Context, jsonrpc.RawParams) ethtypes.EthAddress); ok { + r0 = rf(ctx, p) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(ethtypes.EthAddress) } } - if rf, ok := ret.Get(1).(func(context.Context, address.Address) error); ok { - r1 = rf(ctx, filecoinAddress) + if rf, ok := ret.Get(1).(func(context.Context, jsonrpc.RawParams) error); ok { + r1 = rf(ctx, p) } else { r1 = ret.Error(1) } diff --git a/rosetta/tests/rosetta-config-PR-calibration.json b/rosetta/tests/rosetta-config-PR-calibration.json index a61f8fd..4854b9e 100644 --- a/rosetta/tests/rosetta-config-PR-calibration.json +++ b/rosetta/tests/rosetta-config-PR-calibration.json @@ -29,9 +29,9 @@ "balance_tracking_disabled": false, "coin_tracking_disabled": false, "status_port": 9090, - "start_index": 1974013, + "start_index": 1973893, "end_conditions": { - "index": 1974613 + "index": 1974893 } } } \ No newline at end of file