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

Post-launch cleanup #384

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11,841 −2,287
Open

Post-launch cleanup #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
post-launch cleanup
@andr11111
andr11111 committed Aug 4, 2020
commit acbf7ea3a65447eeb4d78ee75179af5e95ca3d40
2 changes: 1 addition & 1 deletion docker/docker-compose-no-graph.yml
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ services:
CHAIN_ID: "${CHAIN_ID}"
MESH_WEBSOCKET_URI: "http://mesh:60557"
MESH_HTTP_URI: "http://mesh:60556"
POSTGRES_URI: "postgresql://${DB_USER}:${DB_PASSWORD}@hl-orderbook.cluster-ctyabaidtsxx.us-east-2.rds.amazonaws.com"
POSTGRES_URI: "postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}"
WHITELIST_ALL_TOKENS: "*"
ports:
- "${API_PORT}:3000"
14,100 changes: 11,819 additions & 2,281 deletions packages/contracts/package-lock.json
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion packages/honeylemonjs/src/HoneylemonService.ts
View file
Original file line number Diff line number Diff line change
@@ -815,7 +815,8 @@ class OrderbookService {

async getOpenOrders(makerAddress) {
const ordersResponse = await this.apiClient.getOrdersAsync({
makerAddress: makerAddress.toLowerCase()
makerAddress: makerAddress.toLowerCase(),
makerAssetData: this.makerAssetData
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is in order to be able to store multiple contracts (e.g. BTC, ETC) in the same 0x API in the future

});

this._processOrders(ordersResponse);
0 packages/subgraph/config/kovan.json → packages/subgraph/config/kovan-28d.json
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions packages/subgraph/config/kovan-2d.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"network": "kovan",
"ExchangeV3Address": "0x4eacd0af335451709e1e7b570b8ea68edec8bc97",
"MarketContractProxyAddress": "0x23C62ed951406C1da9fbBBc455555E7c41c8e0BA"
}
5 changes: 5 additions & 0 deletions packages/subgraph/config/mainnet-28d.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"network": "mainnet",
"ExchangeV3Address": "0x61935cbdd02287b511119ddb11aeb42f1593b7ef",
"MarketContractProxyAddress": "0x9ceb5486eD0F3F2DBCaE906E4192472e88657983"
}
0 packages/subgraph/config/mainnet.json → packages/subgraph/config/mainnet-2d.json
View file
File renamed without changes.
12 changes: 8 additions & 4 deletions packages/subgraph/package.json
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,15 @@
"create:local": "graph create carboclan/honeylemon --node http://127.0.0.1:8020",
"codegen": "graph codegen --debug --output-dir src/types/",
"build": "graph build --debug",
"deploy:kovan": "graph deploy carboclan/honeylemon-kovan --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
"deploy:mainnet": "graph deploy carboclan/honeylemon --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
"deploy:kovan:2d": "graph deploy carboclan/honeylemon-kovan-2d --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
"deploy:kovan:28d": "graph deploy carboclan/honeylemon-kovan --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
"deploy:mainnet:2d": "graph deploy carboclan/honeylemon-2d --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
"deploy:mainnet:28d": "graph deploy carboclan/honeylemon --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
"deploy:local": "graph deploy carboclan/honeylemon --debug --ipfs http://localhost:5001 --node http://127.0.0.1:8020",
"prepare:kovan": "mustache config/kovan.json subgraph.template.yaml > subgraph.yaml",
"prepare:mainnet": "mustache config/mainnet.json subgraph.template.yaml > subgraph.yaml",
"prepare:kovan:2d": "mustache config/kovan-2d.json subgraph.template.yaml > subgraph.yaml",
"prepare:kovan:28d": "mustache config/kovan-28d.json subgraph.template.yaml > subgraph.yaml",
"prepare:mainnet:2d": "mustache config/mainnet-2d.json subgraph.template.yaml > subgraph.yaml",
"prepare:mainnet:28d": "mustache config/mainnet-28d.json subgraph.template.yaml > subgraph.yaml",
"prepare:local": "mustache config/local.json subgraph.template.yaml > subgraph.yaml"
},
"devDependencies": {
1 change: 1 addition & 0 deletions packages/subgraph/schema.graphql
View file
Original file line number Diff line number Diff line change
@@ -79,6 +79,7 @@ type Contract @entity {
index: BigInt!
collateralPerUnit: BigInt!
settlement: ContractSettlement @derivedFrom(field: "contract")
positions: [Position!] @derivedFrom(field: "contract")
}

type ContractSettlement @entity {