Oxford (#984)

* oxford * Disable oxford in api config * BCD-270-commit-for-jira
baking-bad · Aug 28, 2023 · 5192d54 · 5192d54
1 parent 1b908c6
commit 5192d54
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 4 deletions.
diff --git a/configs/development.yml b/configs/development.yml
@@ -11,6 +11,10 @@ rpc:
     uri: https://rpc.tzkt.io/nairobinet
     timeout: 20
     requests_per_second: 15
+  oxfordnet:
+    uri: https://rpc.tzkt.io/oxfordnet
+    timeout: 20
+    requests_per_second: 20
 
 tzkt:
   mainnet:
@@ -23,6 +27,8 @@ services:
     mempool: https://mempool.test.dipdup.net/v1/graphql
   nairobinet:
     mempool: https://mempool.test.dipdup.net/v1/graphql
+  oxfordnet:
+    mempool: https://mempool.test.dipdup.net/v1/graphql
 
 storage:
   pg: 
@@ -60,10 +66,12 @@ api:
       mainnet: https://rpc.tzkt.io/mainnet
       ghostnet: https://rpc.tzkt.io/ghostnet
       nairobinet: https://rpc.tzkt.io/nairobinet
+      oxfordnet: https://rpc.tzkt.io/oxfordnet       
   networks:
     - mainnet
     - ghostnet
     - nairobinet
+    - oxfordnet
   connections:
     max: 50
     idle: 50
@@ -78,6 +86,8 @@ indexer:
       receiver_threads: 15
     nairobinet:
       receiver_threads: 15
+    oxfordnet:
+      receiver_threads: 10
   connections:
     max: 5
     idle: 5
@@ -92,6 +102,7 @@ scripts:
     - mainnet
     - ghostnet
     - nairobinet
+    - oxfordnet
   connections:
     max: 5
     idle: 5
diff --git a/configs/production.yml b/configs/production.yml
@@ -11,6 +11,10 @@ rpc:
     uri: https://rpc.tzkt.io/nairobinet
     timeout: 20
     requests_per_second: 10
+  oxfordnet:
+    uri: https://rpc.tzkt.io/oxfordnet
+    timeout: 20
+    requests_per_second: 20
 
 tzkt:
   mainnet:
@@ -24,6 +28,8 @@ services:
     mempool: https://mempool.test.dipdup.net/v1/graphql
   nairobinet:
     mempool: https://mempool.test.dipdup.net/v1/graphql
+  oxfordnet:
+    mempool: https://mempool.test.dipdup.net/v1/graphql
 
 storage:
   pg: 
@@ -61,10 +67,12 @@ api:
       mainnet: https://rpc.tzkt.io/mainnet
       ghostnet: https://rpc.tzkt.io/ghostnet
       nairobinet: https://rpc.tzkt.io/nairobinet
+      # oxfordnet: https://rpc.tzkt.io/oxfordnet
   networks:
     - mainnet
     - ghostnet
     - nairobinet
+    # - oxfordnet
   connections:
     max: 50
     idle: 10
@@ -79,6 +87,8 @@ indexer:
       receiver_threads: ${TESTNET_THREADS:-10}
     nairobinet:
       receiver_threads: ${TESTNET_THREADS:-10}
+    oxfordnet:
+      receiver_threads: ${TESTNET_THREADS:-10}
   connections:
     max: 5
     idle: 5
@@ -93,6 +103,7 @@ scripts:
     - mainnet
     - ghostnet
     - nairobinet
+    - oxfordnet
   connections:
     max: 5
     idle: 5
diff --git a/internal/bcd/protocols.go b/internal/bcd/protocols.go
@@ -40,6 +40,7 @@ var symLinks = map[string]string{
 	"PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc": SymLinkJakarta, // Mumbai
 	"PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1": SymLinkJakarta, // Mumbai 2
 	"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf": SymLinkJakarta, // Nairobinet
+	"ProxfordSW2S7fvchT1Zgj2avb5UES194neRyYVXoaDGvF9egt8": SymLinkJakarta, // Oxford
 }
 
 // GetProtoSymLink -
@@ -52,7 +53,7 @@ func GetProtoSymLink(protocol string) (string, error) {
 
 // GetCurrentProtocol - returns last supported protocol
 func GetCurrentProtocol() string {
-	return "PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW"
+	return "PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf"
 }
 
 // Symbolic links
@@ -71,4 +72,5 @@ var ChainID = map[string]string{
 	"NetXizpkH94bocH": "limanet",
 	"NetXQw6nWSnrJ5t": "mumbainet",
 	"NetXyuzvDo2Ugzb": "nairobinet",
+	"NetXH6zDyMzRsUy": "oxfordnet",
 }
diff --git a/internal/models/types/network.go b/internal/models/types/network.go
@@ -31,6 +31,7 @@ const (
 	Mumbainet
 	Rollupnet
 	Nairobinet
+	Oxfordnet
 )
 
 var networkNames = map[Network]string{
@@ -53,6 +54,7 @@ var networkNames = map[Network]string{
 	Mumbainet:    "mumbainet",
 	Rollupnet:    "rollupnet",
 	Nairobinet:   "nairobinet",
+	Oxfordnet:    "oxfordnet",
 }
 
 var namesToNetwork = map[string]Network{
@@ -75,6 +77,7 @@ var namesToNetwork = map[string]Network{
 	"mumbainet":    Mumbainet,
 	"rollupnet":    Rollupnet,
 	"nairobinet":   Nairobinet,
+	"oxfordnet":    Oxfordnet,
 }
 
 // String - convert enum to string for printing

diff --git a/internal/parsers/operations/migration.go b/internal/parsers/operations/migration.go
@@ -59,7 +59,8 @@ func (m Migration) Parse(data noderpc.Operation, operation *operation.Operation,
 		"PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW",
 		"PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
 		"PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
-		"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf":
+		"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf",
+		"ProxfordSW2S7fvchT1Zgj2avb5UES194neRyYVXoaDGvF9egt8":
 
 		return m.fromLazyStorageDiff(data, operation, store)
 	default:

diff --git a/internal/parsers/protocols/protocol.go b/internal/parsers/protocols/protocol.go
@@ -80,7 +80,8 @@ func Get(ctx *config.Context, protocol string) (*Specific, error) {
 		"PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW",
 		"PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
 		"PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
-		"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf":
+		"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf",
+		"ProxfordSW2S7fvchT1Zgj2avb5UES194neRyYVXoaDGvF9egt8":
 		return &Specific{
 			StorageParser:         storage.NewLazyBabylon(ctx.BigMapDiffs, ctx.Operations, ctx.Accounts),
 			ContractParser:        contract.NewJakarta(ctx),
@@ -129,7 +130,8 @@ func NeedImplicitParsing(protocol string) bool {
 		"PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW",
 		"PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
 		"PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
-		"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf":
+		"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf",
+		"ProxfordSW2S7fvchT1Zgj2avb5UES194neRyYVXoaDGvF9egt8":
 		return true
 	}
 	return false