From 65a7ae8a5d03aa7c0c048baf6a21ba1135489194 Mon Sep 17 00:00:00 2001 From: Luis Carvalho Date: Wed, 7 Aug 2024 17:55:15 +0100 Subject: [PATCH] feat: add compass ID to all turnstone messages --- chain/evm/compass.go | 3 +++ go.mod | 5 +++-- go.sum | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/chain/evm/compass.go b/chain/evm/compass.go index cd332b6..1b02379 100644 --- a/chain/evm/compass.go +++ b/chain/evm/compass.go @@ -1058,6 +1058,7 @@ func (t compass) submitBatchSendToEVMClaim(ctx context.Context, event chain.Batc ChainReferenceId: t.ChainReferenceID, Orchestrator: orchestrator, SkywayNonce: event.SkywayNonce, + CompassId: t.CompassID, } return t.paloma.SendBatchSendToEVMClaim(ctx, msg) } @@ -1073,6 +1074,7 @@ func (t compass) submitSendToPalomaClaim(ctx context.Context, event chain.SendTo ChainReferenceId: t.ChainReferenceID, Orchestrator: orchestrator, SkywayNonce: event.SkywayNonce, + CompassId: t.CompassID, } return t.paloma.SendSendToPalomaClaim(ctx, msg) } @@ -1087,6 +1089,7 @@ func (t compass) submitLightNodeSaleClaim(ctx context.Context, event chain.Light Orchestrator: orchestrator, SkywayNonce: event.SkywayNonce, SmartContractAddress: event.SmartContractAddress, + CompassId: t.CompassID, } return t.paloma.SendLightNodeSaleClaim(ctx, msg) } diff --git a/go.mod b/go.mod index e1a09f1..d9224f3 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/jarcoal/httpmock v1.3.1 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 - github.com/palomachain/paloma v1.15.5 + github.com/palomachain/paloma v1.15.6 github.com/roodeag/arbitrum v0.0.0-20230627104516-b95e4c8ebec0 github.com/rs/xid v1.5.0 github.com/sirupsen/logrus v1.9.3 @@ -229,7 +229,8 @@ require ( replace ( // Link to op-geth, which is built on top of go-ethereum github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101311.0 - github.com/palomachain/paloma => github.com/palomachain/paloma v1.3.1-next.0.20240808095442-ad824cc65492 github.com/roodeag/arbitrum => github.com/palomachain/arb-geth v0.0.0-20230824112942-8e77a580a936 ) + +replace github.com/palomachain/paloma => github.com/palomachain/paloma v1.3.1-next.0.20240809084129-00b863098ab7 diff --git a/go.sum b/go.sum index 3097ed6..b52544c 100644 --- a/go.sum +++ b/go.sum @@ -949,8 +949,8 @@ github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnh github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/palomachain/arb-geth v0.0.0-20230824112942-8e77a580a936 h1:fmQAgxcdYBxCZYczws/uxTVOYHZd4fNrOaoHp35HZMM= github.com/palomachain/arb-geth v0.0.0-20230824112942-8e77a580a936/go.mod h1:B2H2+2I4UiMR4hvAIaGLyYszNfSTYC8fWIw+kgfuFSQ= -github.com/palomachain/paloma v1.3.1-next.0.20240808095442-ad824cc65492 h1:BBqlRicqEoJTURM0z127RSc2ZXLZ8IGgSC83narQOg8= -github.com/palomachain/paloma v1.3.1-next.0.20240808095442-ad824cc65492/go.mod h1:91O0VRxBof+IXTZxSsSbk/lV2DSaWQIdUaoCBv6HXDo= +github.com/palomachain/paloma v1.3.1-next.0.20240809084129-00b863098ab7 h1:vW8TOXU16j8BRX8kpBAkVsbHnP0KlnL6Z65InVbfYyw= +github.com/palomachain/paloma v1.3.1-next.0.20240809084129-00b863098ab7/go.mod h1:91O0VRxBof+IXTZxSsSbk/lV2DSaWQIdUaoCBv6HXDo= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=