diff --git a/package.json b/package.json index f147548..b6ba44e 100644 --- a/package.json +++ b/package.json @@ -39,11 +39,11 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.3.19", - "@cerc-io/cli": "^0.2.105", - "@cerc-io/ipld-eth-client": "^0.2.105", - "@cerc-io/solidity-mapper": "^0.2.105", - "@cerc-io/util": "^0.2.105", - "@cerc-io/graph-node": "^0.2.105", + "@cerc-io/cli": "^0.2.106", + "@cerc-io/ipld-eth-client": "^0.2.106", + "@cerc-io/solidity-mapper": "^0.2.106", + "@cerc-io/util": "^0.2.106", + "@cerc-io/graph-node": "^0.2.106", "@ethersproject/providers": "^5.4.4", "debug": "^4.3.1", "decimal.js": "^10.3.1", diff --git a/src/schema.gql b/src/schema.gql index fa61ae5..625800c 100644 --- a/src/schema.gql +++ b/src/schema.gql @@ -1632,14 +1632,14 @@ type User { id: ID! createdAt: BigInt! transactionCount: BigInt! - transactions (orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]! + transactions (where: Transaction_filter, orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]! orderCount: BigInt! - orders (orderBy: Order_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Order!]! + orders (where: Order_filter, orderBy: Order_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Order!]! liquidationCount: BigInt! - liquidations (orderBy: Liquidation_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Liquidation!]! + liquidations (where: Liquidation_filter, orderBy: Liquidation_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Liquidation!]! transferCount: BigInt! - transfers (orderBy: Transfer_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transfer!]! - deposits (orderBy: Deposit_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Deposit!]! + transfers (where: Transfer_filter, orderBy: Transfer_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transfer!]! + deposits (where: Deposit_filter, orderBy: Deposit_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Deposit!]! } type Order { @@ -1657,7 +1657,7 @@ type Order { lendingMarket: LendingMarket! isPreOrder: Boolean! type: OrderType! - transactions (orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]! + transactions (where: Transaction_filter, orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]! isCircuitBreakerTriggered: Boolean! createdAt: BigInt! blockNumber: BigInt! @@ -1669,10 +1669,10 @@ type LendingMarket { currency: Bytes! maturity: BigInt! isActive: Boolean! - transactions (orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]! - orders (orderBy: Order_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Order!]! + transactions (where: Transaction_filter, orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]! + orders (where: Order_filter, orderBy: Order_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Order!]! volume: BigInt! - dailyVolume (orderBy: DailyVolume_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DailyVolume!]! + dailyVolume (where: DailyVolume_filter, orderBy: DailyVolume_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DailyVolume!]! openingUnitPrice: BigInt! lastLendUnitPrice: BigInt! lastBorrowUnitPrice: BigInt! diff --git a/yarn.lock b/yarn.lock index fa56d55..fad97c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -194,10 +194,10 @@ binaryen "101.0.0-nightly.20210723" long "^4.0.0" -"@cerc-io/cache@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.105/cache-0.2.105.tgz#56cfdb5df6835443367343c5c14b9637b9155349" - integrity sha512-tDODHDHoNlvpa0ukcaWqhOSgs16lc/ulhkM4DGVvrJzLOYQY7ErziHCsVRoFdVQ44sv3mXvyMDbENSdNdqNi+A== +"@cerc-io/cache@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.106/cache-0.2.106.tgz#00075d50433421af71639e527d7d6af1320b0150" + integrity sha512-vIHhkKLSaAq9EZp14fTWkb/kbervdt3FDxY3+WOP2qwSvppxiJk8Mvyyt5wmc4Yu0SHWKmdKpRohsF1vrH1DYg== dependencies: canonical-json "^0.0.4" debug "^4.3.1" @@ -205,19 +205,19 @@ fs-extra "^10.0.0" level "^7.0.0" -"@cerc-io/cli@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.105/cli-0.2.105.tgz#a28b8daffa7f482ed997a89f45e62f1b7ea49eec" - integrity sha512-Tb5Pcq9vdd4i37vrMcA3bIz0UalNEmouopC51IzrL2jK4b3tD0Qv1JdJoN5mB03iUf3zINKrCGqUQTN5CMZYaw== +"@cerc-io/cli@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.106/cli-0.2.106.tgz#4711979a23e6a1ab371a76072c1e607b624d0657" + integrity sha512-a9HcukYuW73dCdLaGejjSL84u2h/xVkNCVlAYCkFMEY/CZ171lh5OloVkSUaogrQpng+/IinaXP1UXdnM58aQA== dependencies: "@apollo/client" "^3.7.1" - "@cerc-io/cache" "^0.2.105" - "@cerc-io/ipld-eth-client" "^0.2.105" + "@cerc-io/cache" "^0.2.106" + "@cerc-io/ipld-eth-client" "^0.2.106" "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4" "@cerc-io/nitro-node" "^0.1.15" - "@cerc-io/peer" "^0.2.105" - "@cerc-io/rpc-eth-client" "^0.2.105" - "@cerc-io/util" "^0.2.105" + "@cerc-io/peer" "^0.2.106" + "@cerc-io/rpc-eth-client" "^0.2.106" + "@cerc-io/util" "^0.2.106" "@ethersproject/providers" "^5.4.4" "@graphql-tools/utils" "^9.1.1" "@ipld/dag-cbor" "^8.0.0" @@ -238,16 +238,16 @@ typeorm "0.2.37" yargs "^17.0.1" -"@cerc-io/graph-node@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.105/graph-node-0.2.105.tgz#c78afe9f2e43f1a0f21e99a1685a658912eef239" - integrity sha512-Am/09rCx6/BIO8G6KrLBiVhydlxi0MmrHoHrmaVrHTCdEKtmOWiRVWcSWq1PDJBdPyUp2ZuV8GJECMYDVatvrw== +"@cerc-io/graph-node@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.106/graph-node-0.2.106.tgz#ad78cad7808803612df1ece681d3f543a095dc20" + integrity sha512-T5WuAuFUZP+EMVG7B22YgUHXxQzxCByU1u6gpvESVZsPOQIUn75/4LQpAvVfw/l71DDDHTCrG0KfadTvCnCz+A== dependencies: "@apollo/client" "^3.3.19" "@cerc-io/assemblyscript" "0.19.10-watcher-ts-0.1.2" - "@cerc-io/cache" "^0.2.105" - "@cerc-io/ipld-eth-client" "^0.2.105" - "@cerc-io/util" "^0.2.105" + "@cerc-io/cache" "^0.2.106" + "@cerc-io/ipld-eth-client" "^0.2.106" + "@cerc-io/util" "^0.2.106" "@types/json-diff" "^0.5.2" "@types/yargs" "^17.0.0" bn.js "^4.11.9" @@ -264,14 +264,14 @@ typeorm-naming-strategies "^2.0.0" yargs "^17.0.1" -"@cerc-io/ipld-eth-client@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.105/ipld-eth-client-0.2.105.tgz#c4a42a9d4be823d1b52c79565a9dfeefff9a840b" - integrity sha512-L61Bde4uGu0OepGjaLcMfavdQUEUCevV/eWhSfnJkV8CqXK4zo+kmL0IUKCmCYTuUMlX4IIHB0nypoIQs3j8aw== +"@cerc-io/ipld-eth-client@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.106/ipld-eth-client-0.2.106.tgz#fa48bfa20ed89f0e462676b69f14aff5e612f53f" + integrity sha512-YVGfnyu3dQRLJZvk7zKt/DAB8N5oYpSTizwTY4rrPIY/F5Www/XEEGb2s95JpWtkGc3qqw9EhWYYTGn7FMmXRQ== dependencies: "@apollo/client" "^3.7.1" - "@cerc-io/cache" "^0.2.105" - "@cerc-io/util" "^0.2.105" + "@cerc-io/cache" "^0.2.106" + "@cerc-io/util" "^0.2.106" cross-fetch "^3.1.4" debug "^4.3.1" ethers "^5.4.4" @@ -394,10 +394,10 @@ lodash "^4.17.21" uint8arrays "^4.0.3" -"@cerc-io/peer@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.105/peer-0.2.105.tgz#add0eba37916ddf2b591d9a9c01ee8bf10128014" - integrity sha512-ffbaNJu52x/LO7D9SiXFKmirR57XDEHLPlq2Mbufi+IV/7CUmggdpQLk7kOw5p9j1Exmta/uD5EcdM42yZDphg== +"@cerc-io/peer@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.106/peer-0.2.106.tgz#be00031cfda26995299229f93217d124204fdb1a" + integrity sha512-RGGZZJSgOjHTtdpcB78S/Vdv8gbJsuB8JbXAB38ujpitVHq/vX2V0aRoaBZl248DuGUxLN0lMMeJiYqEFNvtjA== dependencies: "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4" "@cerc-io/prometheus-metrics" "1.1.4" @@ -466,23 +466,23 @@ it-stream-types "^1.0.4" promjs "^0.4.2" -"@cerc-io/rpc-eth-client@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.105/rpc-eth-client-0.2.105.tgz#5b2a08335c6b62c60efd660dec74708c82deebd0" - integrity sha512-FsanKlIz9MglY3EJTBQZ4+zE5+cCezXvt3jCS0lZArRVkb8hFBnnDAYDZ5lC7+k7qUKABqb/Tw2xRhholL3lEw== +"@cerc-io/rpc-eth-client@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.106/rpc-eth-client-0.2.106.tgz#c9c506c43f2865020bb93acec77fb512689648bc" + integrity sha512-/M9U1e2Wjm97bQyNYHsQrapNKA7KUzIFQQx/A8cN/wblMC3Ihe4rcV5eqdfT+ucKT47KoE4JVpCy1wKdJxRPVg== dependencies: - "@cerc-io/cache" "^0.2.105" - "@cerc-io/ipld-eth-client" "^0.2.105" - "@cerc-io/util" "^0.2.105" + "@cerc-io/cache" "^0.2.106" + "@cerc-io/ipld-eth-client" "^0.2.106" + "@cerc-io/util" "^0.2.106" chai "^4.3.4" ethers "^5.4.4" left-pad "^1.3.0" mocha "^8.4.0" -"@cerc-io/solidity-mapper@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.105/solidity-mapper-0.2.105.tgz#c98b25cfd1020da32a67b9a4989bb6da0fa63505" - integrity sha512-f4i0fO1qf3qFpe8nJICHD5S5qRn6ZCVWEjuDdqsByB//jjJLy90yfWmRRR3OTaP9GoBjAomtW6hzKO2WM5H96Q== +"@cerc-io/solidity-mapper@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.106/solidity-mapper-0.2.106.tgz#758afe7c2b0f207d618ad05a2419cc2e4e1f967e" + integrity sha512-yhiOaozk52pFlpejUFjwk8wGrcFo8naJ4cMdYNVAjjnc2T1ANRVR1zOi07g3ylZI+lr86+c+sm5ySac5CCMT3Q== dependencies: dotenv "^10.0.0" @@ -491,15 +491,15 @@ resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fts-channel/-/1.0.3-ts-nitro-0.1.1/ts-channel-1.0.3-ts-nitro-0.1.1.tgz#0768781313a167295c0bf21307f47e02dc17e936" integrity sha512-2jFICUSyffuZ+8+qRhXuLSJq4GJ6Y02wxiXoubH0Kzv2lIKkJtWICY1ZQQhtXAvP0ncAQB85WJHqtqwH8l7J3Q== -"@cerc-io/util@^0.2.105": - version "0.2.105" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.105/util-0.2.105.tgz#14ae4d8f7d3bc077171bd09f5eeb4e848dce69c0" - integrity sha512-d/ZMMwli0T/s3EiEmN82E7QUpxWZLfdjLoqG9hBGRnVRlpWd/f+hZLqmsbckNrERhN7dXIwn5C+SanO7+mu8XQ== +"@cerc-io/util@^0.2.106": + version "0.2.106" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.106/util-0.2.106.tgz#65265c0b4b6078ca9bc765584f701ee52df71dc4" + integrity sha512-OgcdveALMLDmt7uK9btim7UrHapw5uAS6p/uJKFaXxdfXI7NFnAW+Vz1YD6M25qoGkbxFsdLWorccTnvUuoqtw== dependencies: "@apollo/utils.keyvaluecache" "^1.0.1" "@cerc-io/nitro-node" "^0.1.15" - "@cerc-io/peer" "^0.2.105" - "@cerc-io/solidity-mapper" "^0.2.105" + "@cerc-io/peer" "^0.2.106" + "@cerc-io/solidity-mapper" "^0.2.106" "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1" "@ethersproject/properties" "^5.7.0" "@ethersproject/providers" "^5.4.4"