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

fix: resolve testnet prod sync conflicts #4356

Merged
merged 5 commits into from
May 29, 2023
Merged

fix: resolve testnet prod sync conflicts #4356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6aecb0b
Testnet prod (#4353)
wanglonghong May 29, 2023
ed23a85
ci: commitlint
rhlsthrm May 29, 2023
6d679b0
ci: db engine
rhlsthrm May 29, 2023
2294a74
Merge branch 'testnet-prod'
wanglonghong May 29, 2023
0a1c973
ci: fix
wanglonghong May 29, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

## Connext Architecture

The Connext architecture can be seen as a layered system, as follows.
The Connext architecture can be seen as a layered system, as follows:

| Layer | Protocol/Stakeholders |
| -------------------------------- | -------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion ops/modules/db/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resource "aws_db_instance" "db" {
identifier = var.identifier

engine = "postgres"
engine_version = "14.3"
engine_version = "14.7"
instance_class = var.instance_class
allocated_storage = var.allocated_storage

Expand Down
8 changes: 3 additions & 5 deletions packages/agents/sequencer/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@ export const getEnvConfig = (
configJson.auctionWaitTime ||
configFile.auctionWaitTime ||
DEFAULT_AUCTION_WAIT_TIME,
executionWaitTime:
process.env.SEQ_EXECUTION_WAIT_TIME ||
configJson.executionWaitTime ||
configFile.executionWaitTime ||
DEFAULT_EXECUTION_WAIT_TIME,
executionWaitTime: process.env.SEQ_EXECUTION_WAIT_TIME
? +process.env.SEQ_EXECUTION_WAIT_TIME
: undefined || configJson.executionWaitTime || configFile.executionWaitTime || DEFAULT_EXECUTION_WAIT_TIME,
mode: {
cleanup: process.env.SEQ_CLEANUP_MODE || configJson.mode?.cleanup || configFile.mode?.cleanup || false,
},
Expand Down