Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Oxford #984

Merged
merged 3 commits into from
Aug 28, 2023
Merged

Oxford #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
548031e
oxford
aopoltorzhicky Aug 18, 2023
99ca96c
Disable oxford in api config
aopoltorzhicky Aug 27, 2023
0edfcc7
BCD-270-commit-for-jira
aopoltorzhicky Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions configs/development.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -78,6 +86,8 @@ indexer:
receiver_threads: 15
nairobinet:
receiver_threads: 15
oxfordnet:
receiver_threads: 10
connections:
max: 5
idle: 5
Expand All @@ -92,6 +102,7 @@ scripts:
- mainnet
- ghostnet
- nairobinet
- oxfordnet
connections:
max: 5
idle: 5
11 changes: 11 additions & 0 deletions configs/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -93,6 +103,7 @@ scripts:
- mainnet
- ghostnet
- nairobinet
- oxfordnet
connections:
max: 5
idle: 5
4 changes: 3 additions & 1 deletion internal/bcd/protocols.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var symLinks = map[string]string{
"PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc": SymLinkJakarta, // Mumbai
"PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1": SymLinkJakarta, // Mumbai 2
"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf": SymLinkJakarta, // Nairobinet
"ProxfordSW2S7fvchT1Zgj2avb5UES194neRyYVXoaDGvF9egt8": SymLinkJakarta, // Oxford
}

// GetProtoSymLink -
Expand All @@ -52,7 +53,7 @@ func GetProtoSymLink(protocol string) (string, error) {

// GetCurrentProtocol - returns last supported protocol
func GetCurrentProtocol() string {
return "PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW"
return "PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf"
}

// Symbolic links
Expand All @@ -71,4 +72,5 @@ var ChainID = map[string]string{
"NetXizpkH94bocH": "limanet",
"NetXQw6nWSnrJ5t": "mumbainet",
"NetXyuzvDo2Ugzb": "nairobinet",
"NetXH6zDyMzRsUy": "oxfordnet",
}
3 changes: 3 additions & 0 deletions internal/models/types/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const (
Mumbainet
Rollupnet
Nairobinet
Oxfordnet
)

var networkNames = map[Network]string{
Expand All @@ -53,6 +54,7 @@ var networkNames = map[Network]string{
Mumbainet: "mumbainet",
Rollupnet: "rollupnet",
Nairobinet: "nairobinet",
Oxfordnet: "oxfordnet",
}

var namesToNetwork = map[string]Network{
Expand All @@ -75,6 +77,7 @@ var namesToNetwork = map[string]Network{
"mumbainet": Mumbainet,
"rollupnet": Rollupnet,
"nairobinet": Nairobinet,
"oxfordnet": Oxfordnet,
}

// String - convert enum to string for printing
Expand Down
3 changes: 2 additions & 1 deletion internal/parsers/operations/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions internal/parsers/protocols/protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -129,7 +130,8 @@ func NeedImplicitParsing(protocol string) bool {
"PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW",
"PtMumbaiiFFEGbew1rRjzSPyzRbA51Tm3RVZL5suHPxSZYDhCEc",
"PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1",
"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf":
"PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf",
"ProxfordSW2S7fvchT1Zgj2avb5UES194neRyYVXoaDGvF9egt8":
return true
}
return false
Expand Down
Loading