From 548031e638656384c8efe9abaa4c070d4d542dd1 Mon Sep 17 00:00:00 2001 From: Artem Date: Fri, 18 Aug 2023 14:46:11 +0400 Subject: [PATCH 1/3] oxford --- configs/development.yml | 11 +++++++++++ configs/production.yml | 11 +++++++++++ internal/bcd/protocols.go | 4 +++- internal/models/types/network.go | 3 +++ internal/parsers/operations/migration.go | 3 ++- internal/parsers/protocols/protocol.go | 6 ++++-- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/configs/development.yml b/configs/development.yml index 0bd948ddb..1846e3a4c 100644 --- 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 \ No newline at end of file diff --git a/configs/production.yml b/configs/production.yml index 6ff2ebe00..88958c7ba 100644 --- 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 index 51e3f3a71..009338284 100644 --- 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 index ae87c45cd..c90df87cf 100644 --- 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 index beaba2825..43387686a 100644 --- 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 index 888a62041..08f4ebd0e 100644 --- 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 From 99ca96ca21c4a2dbecbdee8a34e244a63fcee369 Mon Sep 17 00:00:00 2001 From: Artem Date: Sun, 27 Aug 2023 15:26:16 +0400 Subject: [PATCH 2/3] Disable oxford in api config --- configs/production.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/production.yml b/configs/production.yml index 88958c7ba..dd5eec275 100644 --- a/configs/production.yml +++ b/configs/production.yml @@ -67,12 +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 + # oxfordnet: https://rpc.tzkt.io/oxfordnet networks: - mainnet - ghostnet - nairobinet - - oxfordnet + # - oxfordnet connections: max: 50 idle: 10 From 0edfcc7770986bf22480f6f27643e87d9e6bb356 Mon Sep 17 00:00:00 2001 From: Artem Date: Sun, 27 Aug 2023 15:57:30 +0400 Subject: [PATCH 3/3] BCD-270-commit-for-jira