From d4ce06aa9edf6715b83d671ef9e2c127cc1f4f67 Mon Sep 17 00:00:00 2001 From: wwestgarth Date: Fri, 16 Aug 2024 13:06:38 +0100 Subject: [PATCH] chore: update given contract changes and both bridges signing the same --- ethereum/multisig.go | 16 +++------------- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ethereum/multisig.go b/ethereum/multisig.go index 30ec99cc..a9d701b2 100644 --- a/ethereum/multisig.go +++ b/ethereum/multisig.go @@ -164,11 +164,7 @@ func (ec EthereumMultisigClient) multisigSetThreshold(ctx context.Context, sessi return fmt.Errorf("failed to get nonce: %w", err) } - var chainID *int64 - if !ec.isPrimary { - chainID = &ec.chainID - } - + chainID := &ec.chainID signature, err := setThresholdSignature( ec.vegaBinary, newThreshold, @@ -222,10 +218,7 @@ func (ec EthereumMultisigClient) multisigAddSigners(ctx context.Context, session return fmt.Errorf("failed to get nonce: %w", err) } - var chainID *int64 - if !ec.isPrimary { - chainID = &ec.chainID - } + chainID := &ec.chainID signature, err := addSignerSignature( ec.vegaBinary, validator.KeyPair.Address, @@ -273,10 +266,7 @@ func (ec EthereumMultisigClient) multisigRemoveSigner(ctx context.Context, sessi return fmt.Errorf("failed to get nonce: %w", err) } - var chainID *int64 - if !ec.isPrimary { - chainID = &ec.chainID - } + chainID := &ec.chainID signature, err := removeSignerSignature( ec.vegaBinary, oldSigner, diff --git a/go.mod b/go.mod index 69867662..36f1d8ac 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.5 require ( - code.vegaprotocol.io/vega v0.77.6 + code.vegaprotocol.io/vega v0.77.9-0.20240815143448-939926c92304 github.com/BurntSushi/toml v1.3.2 github.com/Masterminds/sprig v2.22.0+incompatible github.com/blang/semver v3.5.1+incompatible diff --git a/go.sum b/go.sum index decc2696..3fd0164d 100644 --- a/go.sum +++ b/go.sum @@ -38,6 +38,8 @@ code.vegaprotocol.io/quant v0.2.5 h1:8h+TTHdz1LCO4oGXt8mbowXszd8CQP1MHlJOkthUp1E code.vegaprotocol.io/quant v0.2.5/go.mod h1:HEzOoPKj8OIP49r9AZYeo5281M5ygeGWxopwvt8k6Es= code.vegaprotocol.io/vega v0.77.6 h1:GZfnkzXyt7NXDMuBCdLMW3DW6pJgtS9yQPk8U6zgwwc= code.vegaprotocol.io/vega v0.77.6/go.mod h1:6Qz3v5mEoGHtkBpOTHwg1lfWmV1drAiQ05TtM7OJMh8= +code.vegaprotocol.io/vega v0.77.9-0.20240815143448-939926c92304 h1:aGknTk26i/71z/bQroUvra1CHEOkOyOP9paTfi/FZMQ= +code.vegaprotocol.io/vega v0.77.9-0.20240815143448-939926c92304/go.mod h1:6Qz3v5mEoGHtkBpOTHwg1lfWmV1drAiQ05TtM7OJMh8= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=