From 2197b276fb89086aa1d6a3f959b93a4e00551b13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 21:02:32 +0000 Subject: [PATCH 1/8] Bump golang.org/x/net from 0.6.0 to 0.7.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 893b1fe5..aea2a218 100644 --- a/go.mod +++ b/go.mod @@ -112,7 +112,7 @@ require ( go.uber.org/zap v1.21.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.5.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/text v0.7.0 // indirect diff --git a/go.sum b/go.sum index 694071c3..3a8fa267 100644 --- a/go.sum +++ b/go.sum @@ -1800,8 +1800,9 @@ golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From 17acb26980e609404d705d9e25dd1c6a7598f3dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 21:02:45 +0000 Subject: [PATCH 2/8] Bump google.golang.org/api from 0.110.0 to 0.111.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.110.0 to 0.111.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.110.0...v0.111.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 15 +++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 893b1fe5..934ed8c4 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/sirupsen/logrus v1.9.0 github.com/ubiq/go-ubiq v3.0.1+incompatible golang.org/x/sys v0.5.0 - google.golang.org/api v0.110.0 + google.golang.org/api v0.111.0 gopkg.in/avro.v0 v0.0.0-20171217001914-a730b5802183 ) @@ -58,7 +58,7 @@ require ( require ( cloud.google.com/go v0.107.0 // indirect cloud.google.com/go/compute v1.18.0 // indirect - cloud.google.com/go/iam v0.8.0 // indirect + cloud.google.com/go/iam v0.11.0 // indirect github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect @@ -112,14 +112,14 @@ require ( go.uber.org/zap v1.21.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.5.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.1.12 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc // indirect + google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect google.golang.org/grpc v1.53.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect diff --git a/go.sum b/go.sum index 694071c3..66e3d467 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3v cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc= cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc= cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04= +cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY= +cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU= cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno= cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak= cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= @@ -172,6 +174,7 @@ cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/ cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek= cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0= +cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM= cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM= cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q= cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= @@ -214,8 +217,9 @@ cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc= cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg= -cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= +cloud.google.com/go/iam v0.11.0 h1:kwCWfKwB6ePZoZnGLwrd3B6Ru/agoHANTUBWpVNIdnM= +cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY= cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= @@ -1800,8 +1804,9 @@ golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2176,8 +2181,9 @@ google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7Twe google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= -google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU= google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= +google.golang.org/api v0.111.0 h1:bwKi+z2BsdwYFRKrqwutM+axAlYLz83gt5pDSXCJT+0= +google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2310,8 +2316,9 @@ google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614G google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc h1:ijGwO+0vL2hJt5gaygqP2j6PfflOBrRot0IczKbmtio= google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 h1:znp6mq/drrY+6khTAlJUDNFFcDGV2ENLYKpMq8SyCds= +google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= From 36faaaddd10f5cbf93137a671e0619d7dbc14acc Mon Sep 17 00:00:00 2001 From: Sudeep Date: Mon, 6 Mar 2023 17:41:58 +0530 Subject: [PATCH 3/8] formatting changes to avro codec --- codec/block-ethereum.avsc | 550 +++++++++++++++++++------------------- 1 file changed, 275 insertions(+), 275 deletions(-) diff --git a/codec/block-ethereum.avsc b/codec/block-ethereum.avsc index 75697ac3..abf63d16 100644 --- a/codec/block-ethereum.avsc +++ b/codec/block-ethereum.avsc @@ -1,166 +1,166 @@ { - "type":"record", - "namespace":"com.covalenthq.brp.avro", - "name":"ReplicationSegment", - "fields":[ + "type": "record", + "namespace": "com.covalenthq.brp.avro", + "name": "ReplicationSegment", + "fields": [ { - "name":"replicaEvent", - "type":{ - "type":"array", - "items":{ - "name":"replicaEvent", - "type":"record", - "fields":[ + "name": "replicaEvent", + "type": { + "type": "array", + "items": { + "name": "replicaEvent", + "type": "record", + "fields": [ { - "name":"hash", - "type":"string" + "name": "hash", + "type": "string" }, { - "name":"data", - "type":{ - "name":"data", - "type":"record", - "fields":[ + "name": "data", + "type": { + "name": "data", + "type": "record", + "fields": [ { - "name":"Type", - "type":"string" + "name": "Type", + "type": "string" }, { - "name":"NetworkId", - "type":"int" + "name": "NetworkId", + "type": "int" }, { - "name":"Hash", - "type":"string" + "name": "Hash", + "type": "string" }, { - "name":"TotalDifficulty", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "TotalDifficulty", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"Header", - "type":{ - "name":"Header", - "type":"record", - "fields":[ + "name": "Header", + "type": { + "name": "Header", + "type": "record", + "fields": [ { - "name":"parentHash", - "type":"string" + "name": "parentHash", + "type": "string" }, { - "name":"sha3Uncles", - "type":"string" + "name": "sha3Uncles", + "type": "string" }, { - "name":"miner", - "type":"string" + "name": "miner", + "type": "string" }, { - "name":"stateRoot", - "type":"string" + "name": "stateRoot", + "type": "string" }, { - "name":"transactionsRoot", - "type":"string" + "name": "transactionsRoot", + "type": "string" }, { - "name":"receiptsRoot", - "type":"string" + "name": "receiptsRoot", + "type": "string" }, { - "name":"logsBloom", - "type":{ - "type":"array", - "items":"int" + "name": "logsBloom", + "type": { + "type": "array", + "items": "int" } }, { - "name":"difficulty", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "difficulty", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"number", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "number", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"gasLimit", - "type":"int" + "name": "gasLimit", + "type": "int" }, { - "name":"gasUsed", - "type":"int" + "name": "gasUsed", + "type": "int" }, { - "name":"timestamp", - "type":"int" + "name": "timestamp", + "type": "int" }, { - "name":"extraData", - "type":"string" + "name": "extraData", + "type": "string" }, { - "name":"mixHash", - "type":"string" + "name": "mixHash", + "type": "string" }, { - "name":"nonce", - "type":{ - "type":"array", - "items":"long" + "name": "nonce", + "type": { + "type": "array", + "items": "long" } }, { - "name":"baseFeePerGas", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "baseFeePerGas", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } } ] } }, { - "name":"Transactions", - "type":{ - "type":"array", - "items":{ - "name":"Transactions_record", - "type":"record", - "fields":[ + "name": "Transactions", + "type": { + "type": "array", + "items": { + "name": "Transactions_record", + "type": "record", + "fields": [ { - "name":"type", - "type":"int" + "name": "type", + "type": "int" }, { - "name":"accessList", - "type":{ - "type":"array", - "items":{ - "name":"accessList_record", - "type":"record", - "fields":[ + "name": "accessList", + "type": { + "type": "array", + "items": { + "name": "accessList_record", + "type": "record", + "fields": [ { - "name":"address", - "type":"string" + "name": "address", + "type": "string" }, { - "name":"storageKeys", - "type":{ - "type":"array", - "items":"string" + "name": "storageKeys", + "type": { + "type": "array", + "items": "string" } } ] @@ -168,308 +168,308 @@ } }, { - "name":"chainId", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "chainId", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"nonce", - "type":"long" + "name": "nonce", + "type": "long" }, { - "name":"gasPrice", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "gasPrice", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"gasTipCap", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "gasTipCap", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"gasFeeCap", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "gasFeeCap", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"gas", - "type":"long" + "name": "gas", + "type": "long" }, { - "name":"from", - "type":[ + "name": "from", + "type": [ "null", "string" ], - "default":"null" + "default": "null" }, { - "name":"to", - "type":[ + "name": "to", + "type": [ "null", "string" ], - "default":"null" + "default": "null" }, { - "name":"v", - "type":[ + "name": "v", + "type": [ "null", { - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } ], - "default":"null" + "default": "null" }, { - "name":"r", - "type":[ + "name": "r", + "type": [ "null", { - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } ], - "default":"null" + "default": "null" }, { - "name":"s", - "type":[ + "name": "s", + "type": [ "null", { - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } ], - "default":"null" + "default": "null" }, { - "name":"value", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "value", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"input", - "type":"string" + "name": "input", + "type": "string" } ] } } }, { - "name":"uncles", - "type":{ - "type":"array", - "items":"Header" + "name": "uncles", + "type": { + "type": "array", + "items": "Header" }, "default": [] }, { - "name":"Receipts", - "type":{ - "type":"array", - "items":{ - "name":"Receipts_record", - "type":"record", - "fields":[ + "name": "Receipts", + "type": { + "type": "array", + "items": { + "name": "Receipts_record", + "type": "record", + "fields": [ { - "name":"PostStateOrStatus", - "type":"string" + "name": "PostStateOrStatus", + "type": "string" }, { - "name":"CumulativeGasUsed", - "type":"int" + "name": "CumulativeGasUsed", + "type": "int" }, { - "name":"TxHash", - "type":"string" + "name": "TxHash", + "type": "string" }, { - "name":"ContractAddress", - "type":"string" + "name": "ContractAddress", + "type": "string" }, { - "name":"Logs", - "type":{ - "type":"array", - "items":{ - "name":"Logs_record", - "type":"record", - "fields":[ + "name": "Logs", + "type": { + "type": "array", + "items": { + "name": "Logs_record", + "type": "record", + "fields": [ { - "name":"address", - "type":"string" + "name": "address", + "type": "string" }, { - "name":"topics", - "type":{ - "type":"array", - "items":"string" + "name": "topics", + "type": { + "type": "array", + "items": "string" } }, { - "name":"data", - "type":"string" + "name": "data", + "type": "string" }, { - "name":"blockNumber", - "type":"long" + "name": "blockNumber", + "type": "long" }, { - "name":"transactionHash", - "type":"string" + "name": "transactionHash", + "type": "string" }, { - "name":"transactionIndex", - "type":"int" + "name": "transactionIndex", + "type": "int" }, { - "name":"blockHash", - "type":"string" + "name": "blockHash", + "type": "string" }, { - "name":"logIndex", - "type":"int" + "name": "logIndex", + "type": "int" }, { - "name":"removed", - "type":"boolean" + "name": "removed", + "type": "boolean" } ] } } }, { - "name":"GasUsed", - "type":"int" + "name": "GasUsed", + "type": "int" } ] } } }, { - "name":"Senders", - "type":{ - "type":"array", - "items":"string" + "name": "Senders", + "type": { + "type": "array", + "items": "string" } }, { - "name":"State", - "type":{ - "name":"State", - "type":"record", - "fields":[ + "name": "State", + "type": { + "name": "State", + "type": "record", + "fields": [ { - "name":"AccountRead", - "type":{ - "type":"array", - "items":{ - "name":"AccountRead_record", - "type":"record", - "fields":[ + "name": "AccountRead", + "type": { + "type": "array", + "items": { + "name": "AccountRead_record", + "type": "record", + "fields": [ { - "name":"Address", - "type":"string" + "name": "Address", + "type": "string" }, { - "name":"Nonce", - "type":"long" + "name": "Nonce", + "type": "long" }, { - "name":"Balance", - "type":{ - "type":"bytes", - "logicalType":"decimal", - "precision":1000 + "name": "Balance", + "type": { + "type": "bytes", + "logicalType": "decimal", + "precision": 1000 } }, { - "name":"CodeHash", - "type":"string" + "name": "CodeHash", + "type": "string" } ] } } }, { - "name":"StorageRead", - "type":{ - "type":"array", - "items":{ - "name":"StorageRead_record", - "type":"record", - "fields":[ + "name": "StorageRead", + "type": { + "type": "array", + "items": { + "name": "StorageRead_record", + "type": "record", + "fields": [ { - "name":"Account", - "type":"string" + "name": "Account", + "type": "string" }, { - "name":"SlotKey", - "type":"string" + "name": "SlotKey", + "type": "string" }, { - "name":"Value", - "type":"string" + "name": "Value", + "type": "string" } ] } } }, { - "name":"CodeRead", - "type":{ - "type":"array", - "items":{ - "name":"CodeRead_record", - "type":"record", - "fields":[ + "name": "CodeRead", + "type": { + "type": "array", + "items": { + "name": "CodeRead_record", + "type": "record", + "fields": [ { - "name":"Hash", - "type":"string" + "name": "Hash", + "type": "string" }, { - "name":"Code", - "type":"string" + "name": "Code", + "type": "string" } ] } } }, { - "name":"BlockhashRead", - "type":{ - "type":"array", - "items":{ - "name":"BlockhashRead_record", - "type":"record", - "fields":[ + "name": "BlockhashRead", + "type": { + "type": "array", + "items": { + "name": "BlockhashRead_record", + "type": "record", + "fields": [ { - "name":"BlockNumber", - "type":"long" + "name": "BlockNumber", + "type": "long" }, { - "name":"BlockHash", - "type":"string" + "name": "BlockHash", + "type": "string" } ] } @@ -486,21 +486,21 @@ } }, { - "name":"startBlock", - "type":"long" + "name": "startBlock", + "type": "long" }, { - "name":"endBlock", - "type":"long" + "name": "endBlock", + "type": "long" }, { - "name":"elements", - "type":"long" + "name": "elements", + "type": "long" }, { - "name":"codecVersion", - "type":"double", - "default":0.31 + "name": "codecVersion", + "type": "double", + "default": 0.31 } ] } \ No newline at end of file From 4308c632a7282eb7268ba52f293ef59a046f781a Mon Sep 17 00:00:00 2001 From: Sudeep Date: Mon, 6 Mar 2023 17:21:36 +0530 Subject: [PATCH 4/8] adds withdrawalsHash field to agent and update codec --- codec/block-ethereum.avsc | 8 +++++++ internal/types/eth.go | 33 ++++++++++++++------------- internal/types/types_test/int_test.go | 12 ++++++---- internal/utils/utils.go | 13 +++++++++++ 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/codec/block-ethereum.avsc b/codec/block-ethereum.avsc index abf63d16..caad14e4 100644 --- a/codec/block-ethereum.avsc +++ b/codec/block-ethereum.avsc @@ -128,6 +128,14 @@ "logicalType": "decimal", "precision": 1000 } + }, + { + "name": "withdrawalsRoot", + "type": [ + "null", + "string" + ], + "default": "null" } ] } diff --git a/internal/types/eth.go b/internal/types/eth.go index 6e55cb76..2c227d21 100644 --- a/internal/types/eth.go +++ b/internal/types/eth.go @@ -39,22 +39,23 @@ type BlockNonce [8]byte type Bloom [BloomByteLength]byte type Header struct { - ParentHash common.Hash `json:"parentHash"` - UncleHash common.Hash `json:"sha3Uncles"` - Coinbase common.Address `json:"miner"` - Root common.Hash `json:"stateRoot"` - TxHash common.Hash `json:"transactionsRoot"` - ReceiptHash common.Hash `json:"receiptsRoot"` - Bloom Bloom `json:"logsBloom"` - Difficulty *BigInt `json:"difficulty"` - Number *BigInt `json:"number"` - GasLimit uint64 `json:"gasLimit"` - GasUsed uint64 `json:"gasUsed"` - Time uint64 `json:"timestamp"` - Extra []byte `json:"extraData"` - MixDigest common.Hash `json:"mixHash"` - Nonce BlockNonce `json:"nonce"` - BaseFee *BigInt `json:"baseFeePerGas"` + ParentHash common.Hash `json:"parentHash"` + UncleHash common.Hash `json:"sha3Uncles"` + Coinbase common.Address `json:"miner"` + Root common.Hash `json:"stateRoot"` + TxHash common.Hash `json:"transactionsRoot"` + ReceiptHash common.Hash `json:"receiptsRoot"` + Bloom Bloom `json:"logsBloom"` + Difficulty *BigInt `json:"difficulty"` + Number *BigInt `json:"number"` + GasLimit uint64 `json:"gasLimit"` + GasUsed uint64 `json:"gasUsed"` + Time uint64 `json:"timestamp"` + Extra []byte `json:"extraData"` + MixDigest common.Hash `json:"mixHash"` + Nonce BlockNonce `json:"nonce"` + BaseFee *BigInt `json:"baseFeePerGas"` + WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"nil,optional"` } type Transaction struct { diff --git a/internal/types/types_test/int_test.go b/internal/types/types_test/int_test.go index a7796dc4..cbe87672 100644 --- a/internal/types/types_test/int_test.go +++ b/internal/types/types_test/int_test.go @@ -44,10 +44,11 @@ func TestGolangBindings(t *testing.T) { fmt.Println(mapData["x"]) } -func TestAnother(t *testing.T) { +func TestAvroConversion(t *testing.T) { bigIntV, _ := new(big.Int).SetString("21810676825935641000", 10) replicaCodec := setupReplicaCodec() from := common.StringToAddress("0x21d3b08e73ba157cf46832f2b81644aeea4b4aa4") + whash := common.BigToHash((&big.Int{}).SetInt64(3423423)) seg := event.ReplicationSegment{ BlockReplicaEvent: []*event.BlockReplicaEvent{ { @@ -58,10 +59,11 @@ func TestAnother(t *testing.T) { Hash: common.Hash{}, TotalDifficulty: new(types.BigInt).SetUint64(211), Header: &types.Header{ - Difficulty: new(types.BigInt).SetUint64(211), - Number: new(types.BigInt).SetUint64(211), - BaseFee: new(types.BigInt).SetUint64(211), - Extra: []byte{}, + Difficulty: new(types.BigInt).SetUint64(211), + Number: new(types.BigInt).SetUint64(211), + BaseFee: new(types.BigInt).SetUint64(211), + Extra: []byte{}, + WithdrawalsHash: &whash, }, Transactions: []*types.Transaction{ { diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 347ca0e8..9db9dfd2 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -328,6 +328,19 @@ func MapToAvroUnion(data map[string]interface{}) map[string]interface{} { vst[k5] = vsm } vsd[k4] = vst + } else if k4 == "Header" { + m4 := m3[k4].(map[string]interface{}) + vst := m4 + for k5, v5 := range m4 { + if k5 == "withdrawalsRoot" { + if v5 == nil { + vst[k5] = goavro.Union("null", nil) + } else { + vst[k5] = goavro.Union("string", v5) + } + } + } + vsd[k4] = vst } } vso[k3] = vsd From 8b7c0e68a4b9be165489a72f407274634e3e4577 Mon Sep 17 00:00:00 2001 From: Sudeep Date: Tue, 7 Mar 2023 11:26:02 +0530 Subject: [PATCH 5/8] update avro version for block-ethereum --- codec/block-ethereum.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/block-ethereum.avsc b/codec/block-ethereum.avsc index caad14e4..ce3d7edd 100644 --- a/codec/block-ethereum.avsc +++ b/codec/block-ethereum.avsc @@ -508,7 +508,7 @@ { "name": "codecVersion", "type": "double", - "default": 0.31 + "default": 0.32 } ] } \ No newline at end of file From d9602c36ea63bd12130578f3a35789f120535226 Mon Sep 17 00:00:00 2001 From: Pranay Valson Date: Wed, 8 Mar 2023 11:27:47 -0800 Subject: [PATCH 6/8] revert codec to old formatting Signed-off-by: Pranay Valson --- codec/block-ethereum.avsc | 556 +++++++++++++++++++------------------- 1 file changed, 278 insertions(+), 278 deletions(-) diff --git a/codec/block-ethereum.avsc b/codec/block-ethereum.avsc index ce3d7edd..f4485e31 100644 --- a/codec/block-ethereum.avsc +++ b/codec/block-ethereum.avsc @@ -1,174 +1,174 @@ { - "type": "record", - "namespace": "com.covalenthq.brp.avro", - "name": "ReplicationSegment", - "fields": [ + "type":"record", + "namespace":"com.covalenthq.brp.avro", + "name":"ReplicationSegment", + "fields":[ { - "name": "replicaEvent", - "type": { - "type": "array", - "items": { - "name": "replicaEvent", - "type": "record", - "fields": [ + "name":"replicaEvent", + "type":{ + "type":"array", + "items":{ + "name":"replicaEvent", + "type":"record", + "fields":[ { - "name": "hash", - "type": "string" + "name":"hash", + "type":"string" }, { - "name": "data", - "type": { - "name": "data", - "type": "record", - "fields": [ + "name":"data", + "type":{ + "name":"data", + "type":"record", + "fields":[ { - "name": "Type", - "type": "string" + "name":"Type", + "type":"string" }, { - "name": "NetworkId", - "type": "int" + "name":"NetworkId", + "type":"int" }, { - "name": "Hash", - "type": "string" + "name":"Hash", + "type":"string" }, { - "name": "TotalDifficulty", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"TotalDifficulty", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "Header", - "type": { - "name": "Header", - "type": "record", - "fields": [ + "name":"Header", + "type":{ + "name":"Header", + "type":"record", + "fields":[ { - "name": "parentHash", - "type": "string" + "name":"parentHash", + "type":"string" }, { - "name": "sha3Uncles", - "type": "string" + "name":"sha3Uncles", + "type":"string" }, { - "name": "miner", - "type": "string" + "name":"miner", + "type":"string" }, { - "name": "stateRoot", - "type": "string" + "name":"stateRoot", + "type":"string" }, { - "name": "transactionsRoot", - "type": "string" + "name":"transactionsRoot", + "type":"string" }, { - "name": "receiptsRoot", - "type": "string" + "name":"receiptsRoot", + "type":"string" }, { - "name": "logsBloom", - "type": { - "type": "array", - "items": "int" + "name":"logsBloom", + "type":{ + "type":"array", + "items":"int" } }, { - "name": "difficulty", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"difficulty", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "number", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"number", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "gasLimit", - "type": "int" + "name":"gasLimit", + "type":"int" }, { - "name": "gasUsed", - "type": "int" + "name":"gasUsed", + "type":"int" }, { - "name": "timestamp", - "type": "int" + "name":"timestamp", + "type":"int" }, { - "name": "extraData", - "type": "string" + "name":"extraData", + "type":"string" }, { - "name": "mixHash", - "type": "string" + "name":"mixHash", + "type":"string" }, { - "name": "nonce", - "type": { - "type": "array", - "items": "long" + "name":"nonce", + "type":{ + "type":"array", + "items":"long" } }, { - "name": "baseFeePerGas", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"baseFeePerGas", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "withdrawalsRoot", - "type": [ + "name":"withdrawalsRoot", + "type":[ "null", "string" ], - "default": "null" + "default":"null" } ] } }, { - "name": "Transactions", - "type": { - "type": "array", - "items": { - "name": "Transactions_record", - "type": "record", - "fields": [ + "name":"Transactions", + "type":{ + "type":"array", + "items":{ + "name":"Transactions_record", + "type":"record", + "fields":[ { - "name": "type", - "type": "int" + "name":"type", + "type":"int" }, { - "name": "accessList", - "type": { - "type": "array", - "items": { - "name": "accessList_record", - "type": "record", - "fields": [ + "name":"accessList", + "type":{ + "type":"array", + "items":{ + "name":"accessList_record", + "type":"record", + "fields":[ { - "name": "address", - "type": "string" + "name":"address", + "type":"string" }, { - "name": "storageKeys", - "type": { - "type": "array", - "items": "string" + "name":"storageKeys", + "type":{ + "type":"array", + "items":"string" } } ] @@ -176,308 +176,308 @@ } }, { - "name": "chainId", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"chainId", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "nonce", - "type": "long" + "name":"nonce", + "type":"long" }, { - "name": "gasPrice", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"gasPrice", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "gasTipCap", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"gasTipCap", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "gasFeeCap", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"gasFeeCap", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "gas", - "type": "long" + "name":"gas", + "type":"long" }, { - "name": "from", - "type": [ + "name":"from", + "type":[ "null", "string" ], - "default": "null" + "default":"null" }, { - "name": "to", - "type": [ + "name":"to", + "type":[ "null", "string" ], - "default": "null" + "default":"null" }, { - "name": "v", - "type": [ + "name":"v", + "type":[ "null", { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } ], - "default": "null" + "default":"null" }, { - "name": "r", - "type": [ + "name":"r", + "type":[ "null", { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } ], - "default": "null" + "default":"null" }, { - "name": "s", - "type": [ + "name":"s", + "type":[ "null", { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } ], - "default": "null" + "default":"null" }, { - "name": "value", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"value", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "input", - "type": "string" + "name":"input", + "type":"string" } ] } } }, { - "name": "uncles", - "type": { - "type": "array", - "items": "Header" + "name":"uncles", + "type":{ + "type":"array", + "items":"Header" }, "default": [] }, { - "name": "Receipts", - "type": { - "type": "array", - "items": { - "name": "Receipts_record", - "type": "record", - "fields": [ + "name":"Receipts", + "type":{ + "type":"array", + "items":{ + "name":"Receipts_record", + "type":"record", + "fields":[ { - "name": "PostStateOrStatus", - "type": "string" + "name":"PostStateOrStatus", + "type":"string" }, { - "name": "CumulativeGasUsed", - "type": "int" + "name":"CumulativeGasUsed", + "type":"int" }, { - "name": "TxHash", - "type": "string" + "name":"TxHash", + "type":"string" }, { - "name": "ContractAddress", - "type": "string" + "name":"ContractAddress", + "type":"string" }, { - "name": "Logs", - "type": { - "type": "array", - "items": { - "name": "Logs_record", - "type": "record", - "fields": [ + "name":"Logs", + "type":{ + "type":"array", + "items":{ + "name":"Logs_record", + "type":"record", + "fields":[ { - "name": "address", - "type": "string" + "name":"address", + "type":"string" }, { - "name": "topics", - "type": { - "type": "array", - "items": "string" + "name":"topics", + "type":{ + "type":"array", + "items":"string" } }, { - "name": "data", - "type": "string" + "name":"data", + "type":"string" }, { - "name": "blockNumber", - "type": "long" + "name":"blockNumber", + "type":"long" }, { - "name": "transactionHash", - "type": "string" + "name":"transactionHash", + "type":"string" }, { - "name": "transactionIndex", - "type": "int" + "name":"transactionIndex", + "type":"int" }, { - "name": "blockHash", - "type": "string" + "name":"blockHash", + "type":"string" }, { - "name": "logIndex", - "type": "int" + "name":"logIndex", + "type":"int" }, { - "name": "removed", - "type": "boolean" + "name":"removed", + "type":"boolean" } ] } } }, { - "name": "GasUsed", - "type": "int" + "name":"GasUsed", + "type":"int" } ] } } }, { - "name": "Senders", - "type": { - "type": "array", - "items": "string" + "name":"Senders", + "type":{ + "type":"array", + "items":"string" } }, { - "name": "State", - "type": { - "name": "State", - "type": "record", - "fields": [ + "name":"State", + "type":{ + "name":"State", + "type":"record", + "fields":[ { - "name": "AccountRead", - "type": { - "type": "array", - "items": { - "name": "AccountRead_record", - "type": "record", - "fields": [ + "name":"AccountRead", + "type":{ + "type":"array", + "items":{ + "name":"AccountRead_record", + "type":"record", + "fields":[ { - "name": "Address", - "type": "string" + "name":"Address", + "type":"string" }, { - "name": "Nonce", - "type": "long" + "name":"Nonce", + "type":"long" }, { - "name": "Balance", - "type": { - "type": "bytes", - "logicalType": "decimal", - "precision": 1000 + "name":"Balance", + "type":{ + "type":"bytes", + "logicalType":"decimal", + "precision":1000 } }, { - "name": "CodeHash", - "type": "string" + "name":"CodeHash", + "type":"string" } ] } } }, { - "name": "StorageRead", - "type": { - "type": "array", - "items": { - "name": "StorageRead_record", - "type": "record", - "fields": [ + "name":"StorageRead", + "type":{ + "type":"array", + "items":{ + "name":"StorageRead_record", + "type":"record", + "fields":[ { - "name": "Account", - "type": "string" + "name":"Account", + "type":"string" }, { - "name": "SlotKey", - "type": "string" + "name":"SlotKey", + "type":"string" }, { - "name": "Value", - "type": "string" + "name":"Value", + "type":"string" } ] } } }, { - "name": "CodeRead", - "type": { - "type": "array", - "items": { - "name": "CodeRead_record", - "type": "record", - "fields": [ + "name":"CodeRead", + "type":{ + "type":"array", + "items":{ + "name":"CodeRead_record", + "type":"record", + "fields":[ { - "name": "Hash", - "type": "string" + "name":"Hash", + "type":"string" }, { - "name": "Code", - "type": "string" + "name":"Code", + "type":"string" } ] } } }, { - "name": "BlockhashRead", - "type": { - "type": "array", - "items": { - "name": "BlockhashRead_record", - "type": "record", - "fields": [ + "name":"BlockhashRead", + "type":{ + "type":"array", + "items":{ + "name":"BlockhashRead_record", + "type":"record", + "fields":[ { - "name": "BlockNumber", - "type": "long" + "name":"BlockNumber", + "type":"long" }, { - "name": "BlockHash", - "type": "string" + "name":"BlockHash", + "type":"string" } ] } @@ -494,21 +494,21 @@ } }, { - "name": "startBlock", - "type": "long" + "name":"startBlock", + "type":"long" }, { - "name": "endBlock", - "type": "long" + "name":"endBlock", + "type":"long" }, { - "name": "elements", - "type": "long" + "name":"elements", + "type":"long" }, { - "name": "codecVersion", - "type": "double", - "default": 0.32 + "name":"codecVersion", + "type":"double", + "default":0.32 } ] } \ No newline at end of file From 471104e860251ed759dbb6f309d02e5082830140 Mon Sep 17 00:00:00 2001 From: Pranay Valson Date: Wed, 8 Mar 2023 11:28:21 -0800 Subject: [PATCH 7/8] o/p entire block replication segment Signed-off-by: Pranay Valson --- scripts/replica/extractor2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/replica/extractor2.go b/scripts/replica/extractor2.go index 6a31ccbc..277af2eb 100644 --- a/scripts/replica/extractor2.go +++ b/scripts/replica/extractor2.go @@ -70,7 +70,7 @@ func generateTestForOneBlock() { replicaSegment := decodeReplicaSegment(fileBuff, codec, *formatter) var replicaSegmentJSON []byte - if replicaSegmentJSON, err = json.MarshalIndent(replicaSegment.BlockReplicaEvent[0].Data, "", " "); err != nil { + if replicaSegmentJSON, err = json.MarshalIndent(replicaSegment, "", " "); err != nil { panic(err) } From 9951ffd8c8bcd7ac5519ff6edcfecf816a110fdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 12:13:11 +0530 Subject: [PATCH 8/8] Bump golang.org/x/sys from 0.5.0 to 0.6.0 (#158) Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/golang/sys/releases) - [Commits](https://github.com/golang/sys/compare/v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 934ed8c4..c7bfc8fc 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.9.0 github.com/ubiq/go-ubiq v3.0.1+incompatible - golang.org/x/sys v0.5.0 + golang.org/x/sys v0.6.0 google.golang.org/api v0.111.0 gopkg.in/avro.v0 v0.0.0-20171217001914-a730b5802183 ) diff --git a/go.sum b/go.sum index 66e3d467..a7c9fc0f 100644 --- a/go.sum +++ b/go.sum @@ -1982,8 +1982,9 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=