From 73f6ab66e001a0c6c38fba4cee323cc120395cd9 Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Tue, 9 Jan 2024 11:56:00 -0500 Subject: [PATCH 1/8] Revert "Add encoder defs for events" This reverts commit dd99acc5afb9a206130a6a150a832e592400bbc3. --- core/services/relay/evm/chain_reader.go | 27 ++----------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/core/services/relay/evm/chain_reader.go b/core/services/relay/evm/chain_reader.go index ee33df4f2db..589c8e8b4e8 100644 --- a/core/services/relay/evm/chain_reader.go +++ b/core/services/relay/evm/chain_reader.go @@ -154,7 +154,7 @@ func (cr *chainReader) addMethod( client: cr.client, }) - if err := cr.addMethodEncoderDef(contractName, methodName, method, chainReaderDefinition); err != nil { + if err := cr.addEncoderDef(contractName, methodName, method, chainReaderDefinition); err != nil { return err } @@ -170,15 +170,10 @@ func (cr *chainReader) addEvent(contractName, eventName string, abi abi.ABI, cha lp: cr.lp, hash: event.ID, }) - - if err := cr.addEventEncoderDef(contractName, eventName, event, chainReaderDefinition); err != nil { - return err - } - return cr.addDecoderDef(contractName, eventName, event.Inputs, chainReaderDefinition) } -func (cr *chainReader) addMethodEncoderDef(contractName, methodName string, method abi.Method, chainReaderDefinition types.ChainReaderDefinition) error { +func (cr *chainReader) addEncoderDef(contractName, methodName string, method abi.Method, chainReaderDefinition types.ChainReaderDefinition) error { // ABI.Pack prepends the method.ID to the encodings, we'll need the encoder to do the same. input := &codecEntry{Args: method.Inputs, encodingPrefix: method.ID} @@ -195,24 +190,6 @@ func (cr *chainReader) addMethodEncoderDef(contractName, methodName string, meth return nil } -func (cr *chainReader) addEventEncoderDef(contractName, methodName string, event abi.Event, chainReaderDefinition types.ChainReaderDefinition) error { - // prepend event sig as encodingPrefix - input := &codecEntry{Args: event.Inputs, encodingPrefix: event.ID.Bytes()} - - if err := input.Init(); err != nil { - return err - } - - inputMod, err := chainReaderDefinition.InputModifications.ToModifier(evmDecoderHooks...) - if err != nil { - return err - } - input.mod = inputMod - - cr.parsed.encoderDefs[wrapItemType(contractName, methodName, true)] = input - return nil -} - func (cr *chainReader) addDecoderDef(contractName, methodName string, outputs abi.Arguments, def types.ChainReaderDefinition) error { output := &codecEntry{Args: outputs} mod, err := def.OutputModifications.ToModifier(evmDecoderHooks...) From 50bb0a603aa2422864b43f3c27d3c62a15887b26 Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Tue, 9 Jan 2024 12:25:57 -0500 Subject: [PATCH 2/8] revert the change to codec entry for event and simplify how it's done --- core/services/relay/evm/chain_reader.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/core/services/relay/evm/chain_reader.go b/core/services/relay/evm/chain_reader.go index 589c8e8b4e8..db79a94e390 100644 --- a/core/services/relay/evm/chain_reader.go +++ b/core/services/relay/evm/chain_reader.go @@ -154,15 +154,15 @@ func (cr *chainReader) addMethod( client: cr.client, }) - if err := cr.addEncoderDef(contractName, methodName, method, chainReaderDefinition); err != nil { + if err := cr.addEncoderDef(contractName, methodName, method.Inputs, method.ID, chainReaderDefinition); err != nil { return err } return cr.addDecoderDef(contractName, methodName, method.Outputs, chainReaderDefinition) } -func (cr *chainReader) addEvent(contractName, eventName string, abi abi.ABI, chainReaderDefinition types.ChainReaderDefinition) error { - event, eventExists := abi.Events[chainReaderDefinition.ChainSpecificName] +func (cr *chainReader) addEvent(contractName, eventName string, a abi.ABI, chainReaderDefinition types.ChainReaderDefinition) error { + event, eventExists := a.Events[chainReaderDefinition.ChainSpecificName] if !eventExists { return fmt.Errorf("%w: method %s doesn't exist", commontypes.ErrInvalidConfig, chainReaderDefinition.ChainSpecificName) } @@ -170,12 +170,20 @@ func (cr *chainReader) addEvent(contractName, eventName string, abi abi.ABI, cha lp: cr.lp, hash: event.ID, }) + + // Though nothing is encoded encoderDef is required so that CreateType can return a struct{} for CreateType to allow "decoding" into. + // The caller isn't aware that there are no arguments and will try to encode the parameters. + // The "Arguments" must be empty so decoding is to struct{}, prefix doesn't matter, as this won't be encoded. + if err := cr.addEncoderDef(contractName, eventName, abi.Arguments{}, nil, chainReaderDefinition); err != nil { + return err + } + return cr.addDecoderDef(contractName, eventName, event.Inputs, chainReaderDefinition) } -func (cr *chainReader) addEncoderDef(contractName, methodName string, method abi.Method, chainReaderDefinition types.ChainReaderDefinition) error { +func (cr *chainReader) addEncoderDef(contractName, methodName string, args abi.Arguments, prefix []byte, chainReaderDefinition types.ChainReaderDefinition) error { // ABI.Pack prepends the method.ID to the encodings, we'll need the encoder to do the same. - input := &codecEntry{Args: method.Inputs, encodingPrefix: method.ID} + input := &codecEntry{Args: args, encodingPrefix: prefix} if err := input.Init(); err != nil { return err From fde3943ffcb670febb445afc410618bf3d9a1020 Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Tue, 9 Jan 2024 14:00:20 -0500 Subject: [PATCH 3/8] Add Marshal method for custom codec types. --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 3 +- core/services/relay/evm/chain_reader_test.go | 4 + core/services/relay/evm/types/gen/ints.tmpl | 9 + .../services/relay/evm/types/int_types_gen.go | 504 ++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 +- 9 files changed, 526 insertions(+), 8 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 6951bb95dc1..c740383d4ae 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -19,7 +19,7 @@ require ( github.com/pelletier/go-toml/v2 v2.1.1 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index fd998057b7a..c9a4b6d217b 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1164,8 +1164,9 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce h1:k52jP11oloaZ2SykQO1f9o79n/FnsDLGDcFvzYCe1Ao= github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 h1:XW/sIxViSOdThSu64Qx9sUhjuNVmXMo8kO8w2aVnx/M= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= diff --git a/core/services/relay/evm/chain_reader_test.go b/core/services/relay/evm/chain_reader_test.go index 0cb6e8ff66a..e762f909a1b 100644 --- a/core/services/relay/evm/chain_reader_test.go +++ b/core/services/relay/evm/chain_reader_test.go @@ -22,6 +22,8 @@ import ( clcommontypes "github.com/smartcontractkit/chainlink-common/pkg/types" . "github.com/smartcontractkit/chainlink-common/pkg/types/interfacetests" //nolint common practice to import test mods with . + commontestutils "github.com/smartcontractkit/chainlink-common/pkg/loop/testutils" + "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller" "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks" @@ -36,7 +38,9 @@ import ( const commonGasLimitOnEvms = uint64(4712388) func TestChainReader(t *testing.T) { + t.Parallel() RunChainReaderInterfaceTests(t, &chainReaderInterfaceTester{}) + RunChainReaderInterfaceTests(t, commontestutils.WrapChainReaderTesterForLoop(&chainReaderInterfaceTester{})) } type chainReaderInterfaceTester struct { diff --git a/core/services/relay/evm/types/gen/ints.tmpl b/core/services/relay/evm/types/gen/ints.tmpl index 5a13c483746..38c1fae03a6 100644 --- a/core/services/relay/evm/types/gen/ints.tmpl +++ b/core/services/relay/evm/types/gen/ints.tmpl @@ -30,6 +30,10 @@ func (i *{{.Prefix}}int{{.Size}}) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *{{.Prefix}}int{{.Size}}) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *{{.Prefix}}int{{.Size}}) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -39,6 +43,11 @@ func (i *{{.Prefix}}int{{.Size}}) UnmarshalText(input []byte) error { return i.Verify() } +func (i *{{.Prefix}}int{{.Size}}) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *{{.Prefix}}int{{.Size}}) Verify() error { bi := (*big.Int)(i) {{ if .Signed }} diff --git a/core/services/relay/evm/types/int_types_gen.go b/core/services/relay/evm/types/int_types_gen.go index c469f6ef3fd..0cc1471b37d 100644 --- a/core/services/relay/evm/types/int_types_gen.go +++ b/core/services/relay/evm/types/int_types_gen.go @@ -31,6 +31,10 @@ func (i *int24) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int24) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int24) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -40,6 +44,11 @@ func (i *int24) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int24) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int24) Verify() error { bi := (*big.Int)(i) @@ -70,6 +79,10 @@ func (i *uint24) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint24) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint24) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -79,6 +92,11 @@ func (i *uint24) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint24) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint24) Verify() error { bi := (*big.Int)(i) @@ -109,6 +127,10 @@ func (i *int40) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int40) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int40) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -118,6 +140,11 @@ func (i *int40) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int40) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int40) Verify() error { bi := (*big.Int)(i) @@ -148,6 +175,10 @@ func (i *uint40) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint40) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint40) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -157,6 +188,11 @@ func (i *uint40) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint40) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint40) Verify() error { bi := (*big.Int)(i) @@ -187,6 +223,10 @@ func (i *int48) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int48) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int48) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -196,6 +236,11 @@ func (i *int48) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int48) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int48) Verify() error { bi := (*big.Int)(i) @@ -226,6 +271,10 @@ func (i *uint48) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint48) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint48) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -235,6 +284,11 @@ func (i *uint48) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint48) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint48) Verify() error { bi := (*big.Int)(i) @@ -265,6 +319,10 @@ func (i *int56) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int56) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int56) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -274,6 +332,11 @@ func (i *int56) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int56) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int56) Verify() error { bi := (*big.Int)(i) @@ -304,6 +367,10 @@ func (i *uint56) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint56) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint56) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -313,6 +380,11 @@ func (i *uint56) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint56) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint56) Verify() error { bi := (*big.Int)(i) @@ -343,6 +415,10 @@ func (i *int72) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int72) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int72) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -352,6 +428,11 @@ func (i *int72) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int72) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int72) Verify() error { bi := (*big.Int)(i) @@ -382,6 +463,10 @@ func (i *uint72) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint72) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint72) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -391,6 +476,11 @@ func (i *uint72) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint72) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint72) Verify() error { bi := (*big.Int)(i) @@ -421,6 +511,10 @@ func (i *int80) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int80) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int80) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -430,6 +524,11 @@ func (i *int80) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int80) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int80) Verify() error { bi := (*big.Int)(i) @@ -460,6 +559,10 @@ func (i *uint80) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint80) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint80) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -469,6 +572,11 @@ func (i *uint80) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint80) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint80) Verify() error { bi := (*big.Int)(i) @@ -499,6 +607,10 @@ func (i *int88) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int88) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int88) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -508,6 +620,11 @@ func (i *int88) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int88) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int88) Verify() error { bi := (*big.Int)(i) @@ -538,6 +655,10 @@ func (i *uint88) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint88) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint88) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -547,6 +668,11 @@ func (i *uint88) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint88) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint88) Verify() error { bi := (*big.Int)(i) @@ -577,6 +703,10 @@ func (i *int96) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int96) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int96) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -586,6 +716,11 @@ func (i *int96) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int96) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int96) Verify() error { bi := (*big.Int)(i) @@ -616,6 +751,10 @@ func (i *uint96) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint96) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint96) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -625,6 +764,11 @@ func (i *uint96) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint96) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint96) Verify() error { bi := (*big.Int)(i) @@ -655,6 +799,10 @@ func (i *int104) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int104) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int104) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -664,6 +812,11 @@ func (i *int104) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int104) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int104) Verify() error { bi := (*big.Int)(i) @@ -694,6 +847,10 @@ func (i *uint104) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint104) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint104) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -703,6 +860,11 @@ func (i *uint104) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint104) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint104) Verify() error { bi := (*big.Int)(i) @@ -733,6 +895,10 @@ func (i *int112) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int112) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int112) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -742,6 +908,11 @@ func (i *int112) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int112) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int112) Verify() error { bi := (*big.Int)(i) @@ -772,6 +943,10 @@ func (i *uint112) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint112) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint112) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -781,6 +956,11 @@ func (i *uint112) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint112) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint112) Verify() error { bi := (*big.Int)(i) @@ -811,6 +991,10 @@ func (i *int120) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int120) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int120) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -820,6 +1004,11 @@ func (i *int120) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int120) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int120) Verify() error { bi := (*big.Int)(i) @@ -850,6 +1039,10 @@ func (i *uint120) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint120) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint120) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -859,6 +1052,11 @@ func (i *uint120) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint120) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint120) Verify() error { bi := (*big.Int)(i) @@ -889,6 +1087,10 @@ func (i *int128) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int128) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int128) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -898,6 +1100,11 @@ func (i *int128) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int128) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int128) Verify() error { bi := (*big.Int)(i) @@ -928,6 +1135,10 @@ func (i *uint128) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint128) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint128) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -937,6 +1148,11 @@ func (i *uint128) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint128) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint128) Verify() error { bi := (*big.Int)(i) @@ -967,6 +1183,10 @@ func (i *int136) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int136) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int136) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -976,6 +1196,11 @@ func (i *int136) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int136) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int136) Verify() error { bi := (*big.Int)(i) @@ -1006,6 +1231,10 @@ func (i *uint136) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint136) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint136) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1015,6 +1244,11 @@ func (i *uint136) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint136) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint136) Verify() error { bi := (*big.Int)(i) @@ -1045,6 +1279,10 @@ func (i *int144) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int144) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int144) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1054,6 +1292,11 @@ func (i *int144) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int144) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int144) Verify() error { bi := (*big.Int)(i) @@ -1084,6 +1327,10 @@ func (i *uint144) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint144) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint144) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1093,6 +1340,11 @@ func (i *uint144) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint144) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint144) Verify() error { bi := (*big.Int)(i) @@ -1123,6 +1375,10 @@ func (i *int152) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int152) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int152) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1132,6 +1388,11 @@ func (i *int152) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int152) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int152) Verify() error { bi := (*big.Int)(i) @@ -1162,6 +1423,10 @@ func (i *uint152) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint152) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint152) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1171,6 +1436,11 @@ func (i *uint152) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint152) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint152) Verify() error { bi := (*big.Int)(i) @@ -1201,6 +1471,10 @@ func (i *int160) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int160) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int160) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1210,6 +1484,11 @@ func (i *int160) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int160) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int160) Verify() error { bi := (*big.Int)(i) @@ -1240,6 +1519,10 @@ func (i *uint160) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint160) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint160) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1249,6 +1532,11 @@ func (i *uint160) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint160) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint160) Verify() error { bi := (*big.Int)(i) @@ -1279,6 +1567,10 @@ func (i *int168) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int168) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int168) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1288,6 +1580,11 @@ func (i *int168) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int168) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int168) Verify() error { bi := (*big.Int)(i) @@ -1318,6 +1615,10 @@ func (i *uint168) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint168) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint168) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1327,6 +1628,11 @@ func (i *uint168) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint168) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint168) Verify() error { bi := (*big.Int)(i) @@ -1357,6 +1663,10 @@ func (i *int176) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int176) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int176) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1366,6 +1676,11 @@ func (i *int176) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int176) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int176) Verify() error { bi := (*big.Int)(i) @@ -1396,6 +1711,10 @@ func (i *uint176) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint176) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint176) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1405,6 +1724,11 @@ func (i *uint176) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint176) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint176) Verify() error { bi := (*big.Int)(i) @@ -1435,6 +1759,10 @@ func (i *int184) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int184) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int184) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1444,6 +1772,11 @@ func (i *int184) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int184) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int184) Verify() error { bi := (*big.Int)(i) @@ -1474,6 +1807,10 @@ func (i *uint184) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint184) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint184) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1483,6 +1820,11 @@ func (i *uint184) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint184) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint184) Verify() error { bi := (*big.Int)(i) @@ -1513,6 +1855,10 @@ func (i *int192) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int192) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int192) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1522,6 +1868,11 @@ func (i *int192) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int192) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int192) Verify() error { bi := (*big.Int)(i) @@ -1552,6 +1903,10 @@ func (i *uint192) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint192) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint192) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1561,6 +1916,11 @@ func (i *uint192) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint192) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint192) Verify() error { bi := (*big.Int)(i) @@ -1591,6 +1951,10 @@ func (i *int200) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int200) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int200) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1600,6 +1964,11 @@ func (i *int200) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int200) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int200) Verify() error { bi := (*big.Int)(i) @@ -1630,6 +1999,10 @@ func (i *uint200) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint200) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint200) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1639,6 +2012,11 @@ func (i *uint200) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint200) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint200) Verify() error { bi := (*big.Int)(i) @@ -1669,6 +2047,10 @@ func (i *int208) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int208) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int208) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1678,6 +2060,11 @@ func (i *int208) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int208) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int208) Verify() error { bi := (*big.Int)(i) @@ -1708,6 +2095,10 @@ func (i *uint208) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint208) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint208) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1717,6 +2108,11 @@ func (i *uint208) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint208) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint208) Verify() error { bi := (*big.Int)(i) @@ -1747,6 +2143,10 @@ func (i *int216) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int216) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int216) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1756,6 +2156,11 @@ func (i *int216) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int216) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int216) Verify() error { bi := (*big.Int)(i) @@ -1786,6 +2191,10 @@ func (i *uint216) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint216) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint216) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1795,6 +2204,11 @@ func (i *uint216) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint216) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint216) Verify() error { bi := (*big.Int)(i) @@ -1825,6 +2239,10 @@ func (i *int224) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int224) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int224) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1834,6 +2252,11 @@ func (i *int224) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int224) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int224) Verify() error { bi := (*big.Int)(i) @@ -1864,6 +2287,10 @@ func (i *uint224) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint224) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint224) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1873,6 +2300,11 @@ func (i *uint224) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint224) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint224) Verify() error { bi := (*big.Int)(i) @@ -1903,6 +2335,10 @@ func (i *int232) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int232) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int232) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1912,6 +2348,11 @@ func (i *int232) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int232) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int232) Verify() error { bi := (*big.Int)(i) @@ -1942,6 +2383,10 @@ func (i *uint232) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint232) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint232) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1951,6 +2396,11 @@ func (i *uint232) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint232) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint232) Verify() error { bi := (*big.Int)(i) @@ -1981,6 +2431,10 @@ func (i *int240) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int240) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int240) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -1990,6 +2444,11 @@ func (i *int240) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int240) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int240) Verify() error { bi := (*big.Int)(i) @@ -2020,6 +2479,10 @@ func (i *uint240) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint240) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint240) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -2029,6 +2492,11 @@ func (i *uint240) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint240) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint240) Verify() error { bi := (*big.Int)(i) @@ -2059,6 +2527,10 @@ func (i *int248) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int248) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int248) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -2068,6 +2540,11 @@ func (i *int248) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int248) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int248) Verify() error { bi := (*big.Int)(i) @@ -2098,6 +2575,10 @@ func (i *uint248) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint248) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint248) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -2107,6 +2588,11 @@ func (i *uint248) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint248) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint248) Verify() error { bi := (*big.Int)(i) @@ -2137,6 +2623,10 @@ func (i *int256) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *int256) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *int256) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -2146,6 +2636,11 @@ func (i *int256) UnmarshalText(input []byte) error { return i.Verify() } +func (i *int256) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *int256) Verify() error { bi := (*big.Int)(i) @@ -2176,6 +2671,10 @@ func (i *uint256) UnmarshalCBOR(input []byte) error { return i.Verify() } +func (i *uint256) MarshalCBOR() ([]byte, error) { + return cbor.Marshal((*big.Int)(i)) +} + func (i *uint256) UnmarshalText(input []byte) error { bi := (*big.Int)(i) if _, ok := bi.SetString(string(input), 10); !ok { @@ -2185,6 +2684,11 @@ func (i *uint256) UnmarshalText(input []byte) error { return i.Verify() } +func (i *uint256) MarshalText() ([]byte, error) { + bi := (*big.Int)(i) + return []byte(bi.String()), nil +} + func (i *uint256) Verify() error { bi := (*big.Int)(i) diff --git a/go.mod b/go.mod index 8e6c7f6882f..e2e2d02331e 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 diff --git a/go.sum b/go.sum index bebde1247c1..84ab25d8fee 100644 --- a/go.sum +++ b/go.sum @@ -1150,8 +1150,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce h1:k52jP11oloaZ2SykQO1f9o79n/FnsDLGDcFvzYCe1Ao= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 h1:XW/sIxViSOdThSu64Qx9sUhjuNVmXMo8kO8w2aVnx/M= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 8ce148d746b..a7e5220c253 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/segmentio/ksuid v1.0.4 github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 github.com/smartcontractkit/chainlink-testing-framework v1.22.1 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 505f0d8b8a2..d00f48b4416 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1481,8 +1481,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce h1:k52jP11oloaZ2SykQO1f9o79n/FnsDLGDcFvzYCe1Ao= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 h1:XW/sIxViSOdThSu64Qx9sUhjuNVmXMo8kO8w2aVnx/M= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= From 984f5efa33b99af4963665448e934277c30f65a0 Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Tue, 9 Jan 2024 17:51:24 -0500 Subject: [PATCH 4/8] Updated common, still seeing not found, not sure why... --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 5 ++--- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index c740383d4ae..15cf5764dc3 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -19,7 +19,7 @@ require ( github.com/pelletier/go-toml/v2 v2.1.1 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index c9a4b6d217b..17f474b2fbe 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1164,9 +1164,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240108201526-910166b38bce/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 h1:XW/sIxViSOdThSu64Qx9sUhjuNVmXMo8kO8w2aVnx/M= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 h1:bgF5Df5ClSxkc0S3posRfgLxgrj1iE+vkPcsjyvKqBw= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= diff --git a/go.mod b/go.mod index e2e2d02331e..38831c0db33 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 diff --git a/go.sum b/go.sum index 84ab25d8fee..8f55373754e 100644 --- a/go.sum +++ b/go.sum @@ -1150,8 +1150,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 h1:XW/sIxViSOdThSu64Qx9sUhjuNVmXMo8kO8w2aVnx/M= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 h1:bgF5Df5ClSxkc0S3posRfgLxgrj1iE+vkPcsjyvKqBw= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a7e5220c253..431f6058542 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/segmentio/ksuid v1.0.4 github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 github.com/smartcontractkit/chainlink-testing-framework v1.22.1 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index d00f48b4416..21114316742 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1481,8 +1481,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4 h1:XW/sIxViSOdThSu64Qx9sUhjuNVmXMo8kO8w2aVnx/M= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109183414-aebce71992d4/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 h1:bgF5Df5ClSxkc0S3posRfgLxgrj1iE+vkPcsjyvKqBw= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= From 394dd3a4d4a359174423d3af21ceac14eff72d8c Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Tue, 9 Jan 2024 21:07:28 -0500 Subject: [PATCH 5/8] Update feeds --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 15cf5764dc3..d77f81b6be2 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -244,7 +244,7 @@ require ( github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect - github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 // indirect + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea // indirect github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 17f474b2fbe..860111e2d33 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1170,8 +1170,8 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f7 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 h1:UUHT19viW3IIxsELz3jsvlk5MnID7cMFZlmor4seTKE= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105/go.mod h1:vQIT9tsN85b4DNgdweUilSUPX7R6gosvCmK5fvFgJAs= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd h1:Du67whvAFKjdNwt2vS+qOzoZTvmdgQGRNsrWPeMUyKY= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd/go.mod h1:PvShvOeIuYFytuofvpqcT4cSmwBeVPQCWShM9393uic= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= diff --git a/go.mod b/go.mod index 38831c0db33..23db8188082 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 - github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 diff --git a/go.sum b/go.sum index 8f55373754e..6d4b30b6eb8 100644 --- a/go.sum +++ b/go.sum @@ -1156,8 +1156,8 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f7 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 h1:UUHT19viW3IIxsELz3jsvlk5MnID7cMFZlmor4seTKE= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105/go.mod h1:vQIT9tsN85b4DNgdweUilSUPX7R6gosvCmK5fvFgJAs= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd h1:Du67whvAFKjdNwt2vS+qOzoZTvmdgQGRNsrWPeMUyKY= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd/go.mod h1:PvShvOeIuYFytuofvpqcT4cSmwBeVPQCWShM9393uic= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 431f6058542..69006b00d32 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -363,7 +363,7 @@ require ( github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect - github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 // indirect + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea // indirect github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 21114316742..7036b3013c0 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1487,8 +1487,8 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f7 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105 h1:UUHT19viW3IIxsELz3jsvlk5MnID7cMFZlmor4seTKE= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20231222013040-c93f24a1b105/go.mod h1:vQIT9tsN85b4DNgdweUilSUPX7R6gosvCmK5fvFgJAs= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd h1:Du67whvAFKjdNwt2vS+qOzoZTvmdgQGRNsrWPeMUyKY= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd/go.mod h1:PvShvOeIuYFytuofvpqcT4cSmwBeVPQCWShM9393uic= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= From 57d871fc4d7f750a57e19d83fee8bbb3fb6870da Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Wed, 10 Jan 2024 10:57:09 -0500 Subject: [PATCH 6/8] Update feeds and common to remove accidental debugging log line --- core/scripts/go.mod | 4 ++-- core/scripts/go.sum | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- integration-tests/go.mod | 4 ++-- integration-tests/go.sum | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index d77f81b6be2..a4d5ca47cff 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -19,7 +19,7 @@ require ( github.com/pelletier/go-toml/v2 v2.1.1 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 @@ -244,7 +244,7 @@ require ( github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect - github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd // indirect + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea // indirect github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 860111e2d33..2342ccea9b2 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1164,14 +1164,14 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 h1:bgF5Df5ClSxkc0S3posRfgLxgrj1iE+vkPcsjyvKqBw= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206 h1:CfKu1c/DBx5qi1lFC9e/aVWwO0IyWKw2poBQR2VflnA= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd h1:Du67whvAFKjdNwt2vS+qOzoZTvmdgQGRNsrWPeMUyKY= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd/go.mod h1:PvShvOeIuYFytuofvpqcT4cSmwBeVPQCWShM9393uic= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= diff --git a/go.mod b/go.mod index 23db8188082..280eeeb8717 100644 --- a/go.mod +++ b/go.mod @@ -65,10 +65,10 @@ require ( github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 - github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 diff --git a/go.sum b/go.sum index 6d4b30b6eb8..ba2abb5e5c0 100644 --- a/go.sum +++ b/go.sum @@ -1150,14 +1150,14 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 h1:bgF5Df5ClSxkc0S3posRfgLxgrj1iE+vkPcsjyvKqBw= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206 h1:CfKu1c/DBx5qi1lFC9e/aVWwO0IyWKw2poBQR2VflnA= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd h1:Du67whvAFKjdNwt2vS+qOzoZTvmdgQGRNsrWPeMUyKY= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd/go.mod h1:PvShvOeIuYFytuofvpqcT4cSmwBeVPQCWShM9393uic= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 69006b00d32..0ce96501a03 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/segmentio/ksuid v1.0.4 github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.1 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206 github.com/smartcontractkit/chainlink-testing-framework v1.22.1 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 @@ -363,7 +363,7 @@ require ( github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect - github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd // indirect + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea // indirect github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 7036b3013c0..0077bd23335 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1481,14 +1481,14 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk= github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457 h1:bgF5Df5ClSxkc0S3posRfgLxgrj1iE+vkPcsjyvKqBw= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240109222055-f385b4fa6457/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206 h1:CfKu1c/DBx5qi1lFC9e/aVWwO0IyWKw2poBQR2VflnA= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 h1:Ju0cxdrzGFwHGDPp16IzkOyX87LZ/kKDFG1A+VSEJHY= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd h1:Du67whvAFKjdNwt2vS+qOzoZTvmdgQGRNsrWPeMUyKY= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110013224-0e9227c2bccd/go.mod h1:PvShvOeIuYFytuofvpqcT4cSmwBeVPQCWShM9393uic= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= From b89c20c25cde342731a41f94a51cfd745e937480 Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Wed, 10 Jan 2024 12:04:03 -0500 Subject: [PATCH 7/8] Update feeds to remove accidental log line and to add more logging to warning messages --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 1 + go.mod | 2 +- go.sum | 2 ++ integration-tests/go.mod | 2 +- integration-tests/go.sum | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index a4d5ca47cff..f6ecc45e5b1 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -244,7 +244,7 @@ require ( github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect - github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 // indirect + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea // indirect github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 2342ccea9b2..1db1b00a6fa 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1172,6 +1172,7 @@ github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= diff --git a/go.mod b/go.mod index 280eeeb8717..bd20a94f8a6 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.1.7-0.20240110155415-407896b07206 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 - github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 diff --git a/go.sum b/go.sum index ba2abb5e5c0..525f26dba78 100644 --- a/go.sum +++ b/go.sum @@ -1158,6 +1158,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1 h1:eIwwTq9fvxt7z7JUZl06STwa5VrlYsZZbIjLhMeDD2k= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 0ce96501a03..a7385dfd3f4 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -363,7 +363,7 @@ require ( github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect - github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 // indirect + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea // indirect github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 0077bd23335..854ec3cadb6 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1489,6 +1489,7 @@ github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231221191127-1f32389044ea h1:WzMa0O6DEauMYMIjzS/T1JF8zvFDt4aG6EUTDlStaZo= From 81340262649d84c166f1ce9d14b777bcc76ac29f Mon Sep 17 00:00:00 2001 From: Ryan Tinianov Date: Wed, 10 Jan 2024 12:26:39 -0500 Subject: [PATCH 8/8] Fixup go mod --- core/scripts/go.sum | 3 +-- go.sum | 2 -- integration-tests/go.sum | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 1db1b00a6fa..b6b55e1793c 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1170,8 +1170,7 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f7 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1 h1:eIwwTq9fvxt7z7JUZl06STwa5VrlYsZZbIjLhMeDD2k= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8= diff --git a/go.sum b/go.sum index 525f26dba78..89daa3c160d 100644 --- a/go.sum +++ b/go.sum @@ -1156,8 +1156,6 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f7 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1 h1:eIwwTq9fvxt7z7JUZl06STwa5VrlYsZZbIjLhMeDD2k= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 854ec3cadb6..bd505144336 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1487,8 +1487,7 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f7 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231222201016-da3f0a763f71/go.mod h1:Ppv5X8MTUkkpKdb270dLefjio724vMkCWmSSaWo7CzI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394 h1:Az4gVMH2V7MCdy3Oo4r4vCm2JFQ2x9mnzM8loo/1K/E= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110155523-c8ec3ffd4394/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1 h1:eIwwTq9fvxt7z7JUZl06STwa5VrlYsZZbIjLhMeDD2k= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240110170252-c27581c17dc1/go.mod h1:L2b9/3wYVUqPAeKG/SLG/T0VsMOJtg+ygw8vTmRDMGE= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd h1:9xSwDgRJDIfDw6171PQEyn5IQ1JKpaJnG5NX6KfCaHQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231222220348-c7d81beaf8fd/go.mod h1:kY435jBtHbyzhe+ImAxZ6G229uHbB0ablA+A0tJkDn8=