Skip to content

Commit 5e3bff5

Browse files
committed
fixing compilation issue
1 parent 55a0c9e commit 5e3bff5

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ require (
2525
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250618164021-9b34289a9502
2626
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250616180023-87b70c08d7c0
2727
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e
28+
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250617131436-7c15436c29fd
2829
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a
2930
github.com/smartcontractkit/chainlink-protos/svr v1.1.0
3031
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250528121202-292529af39df
@@ -205,7 +206,3 @@ require (
205206
)
206207

207208
replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250528121202-292529af39df
208-
209-
replace github.com/smartcontractkit/chainlink-common => ../chainlink-common
210-
211-
replace github.com/smartcontractkit/chainlink-framework/chains => ../chainlink-framework/chains

go.sum

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,7 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
637637
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
638638
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
639639
<<<<<<< HEAD
640+
<<<<<<< HEAD
640641
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250618162808-a5a42ee8701b h1:nS5njF5W9lY1LnTITt3V2M35dT19JPpuVg6//vlzFiU=
641642
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250618162808-a5a42ee8701b/go.mod h1:1ntZ0rtQpPx6h+xlcOJp0ccqHFaxTzW2Z62FJG358q0=
642643
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250618164021-9b34289a9502 h1:WLgEB8/lIfA1vI+7O4RE/PYitO57TRkKUqVllDIgJD4=
@@ -646,6 +647,14 @@ github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-202505221100
646647
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250522110034-65c54665034a/go.mod h1:NVoJQoPYr6BorpaXTusoIH1IYTySCmanQ8Q1yv3mNh4=
647648
<<<<<<< HEAD
648649
>>>>>>> 545e5a9129 (PLEX-250 - WriteReport initial implementation)
650+
=======
651+
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250617130623-1b825fd1d77e h1:UcF/QDseqx4uwujULxAQ6ai0d3rRXGXU9Vn1LVelils=
652+
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250617130623-1b825fd1d77e/go.mod h1:1ntZ0rtQpPx6h+xlcOJp0ccqHFaxTzW2Z62FJG358q0=
653+
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250522110034-65c54665034a h1:XpT8sAcjUVVD7Tcuxx77rD9g5DXFZu3LFxk59SDmPm0=
654+
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250522110034-65c54665034a/go.mod h1:NVoJQoPYr6BorpaXTusoIH1IYTySCmanQ8Q1yv3mNh4=
655+
<<<<<<< HEAD
656+
<<<<<<< HEAD
657+
>>>>>>> e0f33af5de (fixing compilation issue)
649658
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250616180023-87b70c08d7c0 h1:OpFlG2f+LXsDp3cejSQju2rmoNsxBlhgrwXMIsk72IA=
650659
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250616180023-87b70c08d7c0/go.mod h1:X+a4k2a+2G2/yeAaRQMCTLmlhNdQYAeN6v+ZpLzRZww=
651660
<<<<<<< HEAD
@@ -654,6 +663,10 @@ github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e
654663
=======
655664
=======
656665
>>>>>>> a1239ddce6 (PLEX-250 - WriteReport initial implementation)
666+
=======
667+
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250617131436-7c15436c29fd h1:7dEEuuLos8YlXI2AsnEfqLwTfUIawSF0WlknsJ4/Eog=
668+
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250617131436-7c15436c29fd/go.mod h1:BLEQYCcR2mSSTdUqGxnvJ3bqwzQN7KjTBG1BDJwaXY4=
669+
>>>>>>> c31efa585b (fixing compilation issue)
657670
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65c54665034a h1:bFYBcW0cmhq0G8NSjPxSFfL/fVODuhEGluyWOxJTqqk=
658671
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65c54665034a/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
659672
>>>>>>> 1ea3fe4233 (PLEX-250 - WriteReport initial implementation)

pkg/heads/tracker.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,9 @@ func (*nullTracker) LatestSafeBlock(ctx context.Context) (safe *evmtypes.Head, e
5454
func (*nullTracker) LatestAndFinalizedBlock(ctx context.Context) (latest, finalized *evmtypes.Head, err error) {
5555
return nil, nil, nil
5656
}
57+
58+
func (*nullTracker) LatestSafeBlock(ctx context.Context) (safe *evmtypes.Head, err error) {
59+
return nil, nil
60+
}
61+
62+

pkg/txm/orchestrator.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ func (o *Orchestrator[BLOCK_HASH, HEAD]) GetTransactionFee(ctx context.Context,
353353
}
354354

355355
func (o *Orchestrator[BLOCK_HASH, HEAD]) CalculateFee(feeParts txmgr.FeeParts) *big.Int {
356-
//unimplemented
357356
return big.NewInt(0)
358357
}
359358

0 commit comments

Comments
 (0)