Merge pull request #24 from dipdup-io/oxfordnet

Oxfordnet
dipdup-io · Feb 4, 2024 · 076e3b5 · 076e3b5
2 parents 065fbc6 + 8db8fd5
commit 076e3b5
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 126 deletions.
diff --git a/build/dipdup.testnet.yml b/build/dipdup.testnet.yml
@@ -93,48 +93,48 @@ mempool:
         tzkt: nairobinet_tzkt
         rpc: nairobinet_rpc
 
-    # oxfordnet:
-    #   filters:
-    #     kinds:
-    #       - endorsement
-    #       - transaction
-    #       - activate_account
-    #       - ballot
-    #       - delegation
-    #       - double_baking_evidence
-    #       - double_endorsement_evidence
-    #       - origination
-    #       - proposals
-    #       - reveal
-    #       - seed_nonce_revelation
-    #       - register_global_constant
-    #       - set_deposits_limit
-    #       - preendorsement
-    #       - double_preendorsement_evidence
-    #       - tx_rollup_commit
-    #       - tx_rollup_dispatch_tickets
-    #       - tx_rollup_finalize_commitment
-    #       - tx_rollup_origination
-    #       - tx_rollup_rejection
-    #       - tx_rollup_remove_commitment
-    #       - tx_rollup_return_bond
-    #       - tx_rollup_submit_batch
-    #       - transfer_ticket
-    #       - vdf_revelation
-    #       - Increase_paid_storage
-    #       - drain_delegate
-    #       - update_consensus_key
-    #       - smart_rollup_add_messages
-    #       - smart_rollup_originate
-    #       - smart_rollup_execute_outbox_message
-    #       - smart_rollup_refute
-    #       - smart_rollup_publish
-    #       - smart_rollup_recover_bond
-    #       - smart_rollup_timeout
-    #       - smart_rollup_cement
-    #   datasources:
-    #     tzkt: oxfordnet_tzkt
-    #     rpc: oxfordnet_rpc
+    oxfordnet:
+      filters:
+        kinds:
+          - endorsement
+          - transaction
+          - activate_account
+          - ballot
+          - delegation
+          - double_baking_evidence
+          - double_endorsement_evidence
+          - origination
+          - proposals
+          - reveal
+          - seed_nonce_revelation
+          - register_global_constant
+          - set_deposits_limit
+          - preendorsement
+          - double_preendorsement_evidence
+          - tx_rollup_commit
+          - tx_rollup_dispatch_tickets
+          - tx_rollup_finalize_commitment
+          - tx_rollup_origination
+          - tx_rollup_rejection
+          - tx_rollup_remove_commitment
+          - tx_rollup_return_bond
+          - tx_rollup_submit_batch
+          - transfer_ticket
+          - vdf_revelation
+          - Increase_paid_storage
+          - drain_delegate
+          - update_consensus_key
+          - smart_rollup_add_messages
+          - smart_rollup_originate
+          - smart_rollup_execute_outbox_message
+          - smart_rollup_refute
+          - smart_rollup_publish
+          - smart_rollup_recover_bond
+          - smart_rollup_timeout
+          - smart_rollup_cement
+      datasources:
+        tzkt: oxfordnet_tzkt
+        rpc: oxfordnet_rpc
 
 database:
   kind: postgres

diff --git a/cmd/mempool/tzkt/tzkt.go b/cmd/mempool/tzkt/tzkt.go
@@ -41,7 +41,7 @@ func NewTzKT(url string, accounts []string, kinds []string) *TzKT {
 		}
 	}
 	return &TzKT{
-		client:     events.NewTzKT(fmt.Sprintf("%s/%s", strings.TrimSuffix(url, "/"), "v1/events")),
+		client:     events.NewTzKT(fmt.Sprintf("%s/%s", strings.TrimSuffix(url, "/"), "v1/ws")),
 		kinds:      tzktKinds,
 		accounts:   accounts,
 		api:        api.New(url),

diff --git a/go.mod b/go.mod
@@ -15,20 +15,22 @@ require (
 	github.com/spf13/cobra v1.6.1
 	github.com/ubiq/go-ubiq v3.0.1+incompatible
 	github.com/uptrace/bun v1.1.14
-	golang.org/x/crypto v0.14.0
+	golang.org/x/crypto v0.17.0
 )
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/containerd/containerd v1.7.3 // indirect
+	github.com/containerd/containerd v1.7.11 // indirect
+	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v24.0.5+incompatible // indirect
+	github.com/docker/docker v24.0.7+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/ebellocchia/go-base58 v0.1.0 // indirect
@@ -56,7 +58,7 @@ require (
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-sqlite3 v1.14.17 // indirect
+	github.com/mattn/go-sqlite3 v1.14.19 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/moby/patternmatcher v0.5.0 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
@@ -66,14 +68,14 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
-	github.com/opencontainers/runc v1.1.5 // indirect
+	github.com/opencontainers/runc v1.1.12 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/testcontainers/testcontainers-go v0.22.0 // indirect
 	github.com/testcontainers/testcontainers-go/modules/postgres v0.22.0 // indirect
@@ -87,14 +89,14 @@ require (
 	github.com/vmihailenco/tagparser v0.1.2 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
-	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/mod v0.11.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
-	google.golang.org/grpc v1.57.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.10.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/grpc v1.58.3 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.5.1 // indirect
 	gorm.io/driver/postgres v1.5.2 // indirect