From 81ec1fa5f5237ad0840a91294668e7b51681bf5a Mon Sep 17 00:00:00 2001 From: zeekay Date: Tue, 30 Jun 2026 15:49:29 -0700 Subject: [PATCH] warp: migrate p/network off removed extwarp.UnsignedMessage -> warp.Message (bump luxfi/warp v1.19.3->v1.24.0) Co-authored-by: Hanzo Dev --- go.mod | 6 +++--- go.sum | 16 +++++++++++----- p/network/network.go | 2 +- p/network/warp.go | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 5e46faf..e7cb420 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/luxfi/genesis/builder v0.0.0-20260607050918-bf8751181b9c github.com/luxfi/ids v1.2.15 github.com/luxfi/keychain v1.0.2 - github.com/luxfi/log v1.4.1 + github.com/luxfi/log v1.4.3 github.com/luxfi/math v1.4.1 github.com/luxfi/metric v1.5.8 github.com/luxfi/mock v0.1.1 @@ -35,7 +35,7 @@ require ( github.com/luxfi/utxo v0.3.7 github.com/luxfi/validators v1.2.0 github.com/luxfi/vm v1.2.0 - github.com/luxfi/warp v1.19.3 + github.com/luxfi/warp v1.24.0 github.com/luxfi/zap v0.7.2 github.com/luxfi/zapcodec v1.0.1 github.com/stretchr/testify v1.11.1 @@ -107,7 +107,7 @@ require ( github.com/luxfi/zapdb v1.10.0 // indirect github.com/luxfi/zwing v0.5.2 // indirect github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-isatty v0.0.21 // indirect github.com/miekg/dns v1.1.72 // indirect github.com/minio/crc64nvme v1.1.1 // indirect github.com/minio/md5-simd v1.1.2 // indirect diff --git a/go.sum b/go.sum index d9b726f..eac2e6a 100644 --- a/go.sum +++ b/go.sum @@ -162,7 +162,7 @@ github.com/luxfi/accel v1.2.2 h1:IzG1qUogapr4/KbbHP9avAimu3ioGJqh67WYKHxfZys= github.com/luxfi/accel v1.2.2/go.mod h1:5IvpNMfw9FgeBB9oobp+jbauAdhapfhc2bHYPUsHL9Y= github.com/luxfi/address v1.0.1 h1:Sc4keyuVzBIvHr7uVeYZf2/WY9YDGUgDi/iiWenj49g= github.com/luxfi/address v1.0.1/go.mod h1:5j3Eh66v9zvv1GbNdZwt+23krV8JlSDaRzmWZU8ZRM0= -github.com/luxfi/age v1.5.0 h1:G69HbSV4R3vKEH9B0CulnRaMdSdf4RalMgP8xKmxHeI= +github.com/luxfi/age v1.5.0 h1:zC/Fw/ptZwAXr9nqrxmrcf8752EIl1Lq9RECp9OmCO0= github.com/luxfi/age v1.5.0/go.mod h1:iAYAxgvrXxcy746+Ovh/eWWDuF9teJLNcCSSOX9RYW0= github.com/luxfi/api v1.0.14 h1:WgkdNw9jNo6NXdR3z8Z7EBuiPJ9ibGJ0t1HTarH6l/E= github.com/luxfi/api v1.0.14/go.mod h1:J4KfArXSmYBRBpYEZXOqmOt9aekL2zBiBGMmRYSqvc4= @@ -206,6 +206,8 @@ github.com/luxfi/keychain v1.0.2 h1:uQgmjs37/VBIALEiYrrszTpxvtqr07/YvS9TnmxGafs= github.com/luxfi/keychain v1.0.2/go.mod h1:q/4ULgZBlstKkwzOzG/0T6y73BDPgnkrcibbJyTvmbU= github.com/luxfi/log v1.4.1 h1:rIfFRodb9jrD/w7KayaUk0Oc+37PaQQdKEEMJCjR8gw= github.com/luxfi/log v1.4.1/go.mod h1:64IE3xRMJcpkQwnPUfJw3pDj7wU0kRS7BZ9wM7R72jk= +github.com/luxfi/log v1.4.3 h1:xkUKRWvQ4ZwvlUC2e0/RTtHYZOYSMvSQ9W9lbjwBmiI= +github.com/luxfi/log v1.4.3/go.mod h1:myIkufyiQomSQH34K981kbz6cG4WUoerRUh7F4XhlQI= github.com/luxfi/math v1.4.1 h1:1t9bCCsEqnl9yIKrShlbs80DBKyYTWdnzkVfBqEeO7Q= github.com/luxfi/math v1.4.1/go.mod h1:QvbRxauQyE1w4lvbcLSe6c8yeJz2Zj1Bq1rayGgs2tA= github.com/luxfi/math/big v0.1.0 h1:Vz4c0RsZVPdIKPsHPgAJChH/R3p15WHRUz7LkLf+NIQ= @@ -218,13 +220,13 @@ github.com/luxfi/mock v0.1.1 h1:0HEtIjg1J6CWz+IUyP6rsGqNWTcmxjFnSQIhaDuARwY= github.com/luxfi/mock v0.1.1/go.mod h1:jo35akl3Vtd8LbzDts8VJ0jmSVycrd1/eBi6g6t5hKU= github.com/luxfi/net v0.0.5 h1:F1lD3NsIioV0wr2V5jWc4TtMyiE/Ffo1LoeblFv3TrI= github.com/luxfi/net v0.0.5/go.mod h1:BEQR1HEVmkjii/F1R6vJrNUVE7wr55b4eMq9Iz5wjUw= -github.com/luxfi/node v1.30.6 h1:eahkBJSCD1if0ruURd1F67vSEZw4+3T3bFpBSc55BsY= +github.com/luxfi/node v1.30.6 h1:pyuxUjWFvydlBcYrGq5uBPLwZOtu18y6MVb550npiYY= github.com/luxfi/node v1.30.6/go.mod h1:lWXDp8RQXEPdRvhu4iwTdf7CHm20b2CBZVbeq1maVAU= github.com/luxfi/ordering v0.0.1 h1:pZkMD5AC1Q/5RnZsTKK0KWd1tHXiJw7WPU0oebT0wog= github.com/luxfi/ordering v0.0.1/go.mod h1:Ld5UAayScKxicsd9BYuQ/D7vzEUndOC7cGCT+fj++jM= github.com/luxfi/p2p v1.21.1 h1:gmz1JMDhzHIL3dQlhwIDvR4OlFuhNVfnWUl/ipYhAIo= github.com/luxfi/p2p v1.21.1/go.mod h1:SsNPR5fPGWWNem9plGWhSmRqyDoysJ3kPAN0zG0g3iw= -github.com/luxfi/pq v1.0.3 h1:pFlQm1+5FuKTDUh2y/23bXWkN4I2Rc5iuxJypwDFFMs= +github.com/luxfi/pq v1.0.3 h1:ksw1dmfTR0dqqNMRS7BjGcprCO2Fhc+3Iiq2/NMuONw= github.com/luxfi/pq v1.0.3/go.mod h1:8bppZcRElfrVt0n3nYCZW3iX1TvhvzNbdjNdK1irgIE= github.com/luxfi/rpc v1.1.0 h1:B/PJbK399th1mHRDSufhCpVbAciZqId3LsaWhIGNWH4= github.com/luxfi/rpc v1.1.0/go.mod h1:s0bI7/Wg1ZdFdG/cQK+4pZNdEmUsXNBA3HeZRZ+XLeM= @@ -232,9 +234,9 @@ github.com/luxfi/runtime v1.1.1 h1:vOMe82PL3bpSbslS7p69dKRpbr2qW2vOOAwej3UkkmU= github.com/luxfi/runtime v1.1.1/go.mod h1:fmG6+Zxj4wSNlXwiUfDthQDY+SfxVu6S0fX2lL6VbrE= github.com/luxfi/sampler v1.1.0 h1:u3iRDl7V06ARh0e85h3HT+aZ1saCFo2yMMsh+dCJbqk= github.com/luxfi/sampler v1.1.0/go.mod h1:kJa53S3tC9+VSbuV3RFu68MmbCCBlr2UM39LOClQ/Hs= -github.com/luxfi/sdk v1.17.8 h1:37i8EFFjeh9S7LtqVHTXCgnVZnqXziBmUJQV/CHJiiU= +github.com/luxfi/sdk v1.17.8 h1:ciY7OPlrVKpou375uLw3WhMx18GxScmV3mcF12Jesiw= github.com/luxfi/sdk v1.17.8/go.mod h1:tocaidx7GeViPPYrMv0IE2l+CThYu1hfFTWGlItFP4A= -github.com/luxfi/staking v1.5.0 h1:Y8cbkG9SHJLiNPXVmz2ZFJzroMRgeAFJyH9yxPs53/w= +github.com/luxfi/staking v1.5.0 h1:9XLRGL2wx4D2JRnPjlWNkFh214286Ixr08efFLOQoo4= github.com/luxfi/staking v1.5.0/go.mod h1:OULMrYj4FYPCH7fxKOIJLNuzg5QhrSZfVyPWdGpnxG8= github.com/luxfi/timer v1.0.2 h1:g/odi0VQJIsrzdklJUG1thHZ/sGNnbIiVGcU6LctJm0= github.com/luxfi/timer v1.0.2/go.mod h1:SoaZwntYigUE3H6z1GV32YwP8QaSiAT0UiEv7iPugXg= @@ -256,6 +258,8 @@ github.com/luxfi/vm v1.2.0 h1:jTwQRHdC9VmyRZTPSn+IqjMju7f6xlxLc6P9CEg+Y2M= github.com/luxfi/vm v1.2.0/go.mod h1:qasVIBRerVQuvy9vFGrX3H8X8pPMPG5un/KbZSyq5YY= github.com/luxfi/warp v1.19.3 h1:tU6aAniYrPiRGrht7oFSwsUmk5KBb9RDFSyZq3lJ4HY= github.com/luxfi/warp v1.19.3/go.mod h1:kqyk7Fa5mgw1zzMLqjrZWVLuTef35CCW0gOEv10UlZk= +github.com/luxfi/warp v1.24.0 h1:jrcJNlbOiZsAEopJMy9bSaCwI5NDZ8qgp/6sNoXqepg= +github.com/luxfi/warp v1.24.0/go.mod h1:bKvTi24JHlANsl7qkWZAVr/DsMfvwy42f+Cc9x4+Sq8= github.com/luxfi/zap v0.7.2 h1:YecWTWNE5PPJXL56sLIkzS8b23bprUwZ5lPAQuLUtTE= github.com/luxfi/zap v0.7.2/go.mod h1:1k+nwT+JW802YzuPAuf7CxMSGr/qxvbGgGwi5k6X9Ok= github.com/luxfi/zapcodec v1.0.1 h1:pRxLxCOi6uihQMg8A8riDjNjefU2cXZxfRVZ+obeuL8= @@ -268,6 +272,8 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs= +github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= diff --git a/p/network/network.go b/p/network/network.go index 424cd4d..48f4e6e 100644 --- a/p/network/network.go +++ b/p/network/network.go @@ -44,7 +44,7 @@ type warpSignerAdapter struct { } // Sign implements extwarp.Signer interface -func (a *warpSignerAdapter) Sign(msg *extwarp.UnsignedMessage) ([]byte, error) { +func (a *warpSignerAdapter) Sign(msg *extwarp.Message) ([]byte, error) { // Convert external warp message to internal warp message // msg.SourceChainID is already ids.ID type internalMsg, err := warp.NewUnsignedMessage(a.codec, msg.NetworkID, msg.SourceChainID, msg.Payload) diff --git a/p/network/warp.go b/p/network/warp.go index f5d6ee7..b409c5a 100644 --- a/p/network/warp.go +++ b/p/network/warp.go @@ -41,7 +41,7 @@ type signatureRequestVerifier struct { // implementation lives in a separate file under -tags grpc. func (s signatureRequestVerifier) Verify( _ context.Context, - _ *warp.UnsignedMessage, + _ *warp.Message, _ []byte, ) error { return ErrWarpVerificationNotImplemented