From 7857b2b6fca65a502075f365c5fca4cb235ef78d Mon Sep 17 00:00:00 2001 From: elshenak Date: Mon, 11 Mar 2024 15:55:27 -0400 Subject: [PATCH 1/4] refactor: adding contract type to user --- src/gql/heart-monitor/heart-monitor.test.ts | 1 + src/gql/query/index.ts | 4 ++-- src/gql/utils/defaultObjects.ts | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gql/heart-monitor/heart-monitor.test.ts b/src/gql/heart-monitor/heart-monitor.test.ts index d86a020c..1f9efbe1 100644 --- a/src/gql/heart-monitor/heart-monitor.test.ts +++ b/src/gql/heart-monitor/heart-monitor.test.ts @@ -1180,6 +1180,7 @@ test("wasm", async () => { where: { contractAddress: { like: "123" }, userAddress: { eq: "456" }, + contractType: { eq: "airdrop" }, }, limit: 1, }, diff --git a/src/gql/query/index.ts b/src/gql/query/index.ts index c1fe4cb9..fd5d833e 100644 --- a/src/gql/query/index.ts +++ b/src/gql/query/index.ts @@ -9,8 +9,8 @@ export * from "./featureFlags" export * from "./governance" export * from "./ibc" export * from "./inflation" -export * from "./marketing" export * from "./markPriceCandles" +export * from "./marketing" export * from "./oracle" export * from "./perp" export * from "./redelegations" @@ -18,8 +18,8 @@ export * from "./spotLpPositions" export * from "./spotPoolCreated" export * from "./spotPoolExited" export * from "./spotPoolJoined" -export * from "./spotPools" export * from "./spotPoolSwap" +export * from "./spotPools" export * from "./stats" export * from "./unbondings" export * from "./users" diff --git a/src/gql/utils/defaultObjects.ts b/src/gql/utils/defaultObjects.ts index 1cd61d26..8a6916af 100644 --- a/src/gql/utils/defaultObjects.ts +++ b/src/gql/utils/defaultObjects.ts @@ -419,6 +419,7 @@ export const defaultIbcChannelsResponse: GQLIbcChannelsResponse = { export const defaultUserContract: GQLUserContract = { user: defaultUser, contractAddress: "", + contractType: "", } export const defaultInflationDistribution: GQLInflationDistribution = { From 00d98cbcfafcc21e9bb32f370be7040c167ab198 Mon Sep 17 00:00:00 2001 From: elshenak Date: Mon, 11 Mar 2024 16:25:28 -0400 Subject: [PATCH 2/4] fix: tests --- src/gql/heart-monitor/heart-monitor.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gql/heart-monitor/heart-monitor.test.ts b/src/gql/heart-monitor/heart-monitor.test.ts index 1f9efbe1..06d536a4 100644 --- a/src/gql/heart-monitor/heart-monitor.test.ts +++ b/src/gql/heart-monitor/heart-monitor.test.ts @@ -1180,7 +1180,7 @@ test("wasm", async () => { where: { contractAddress: { like: "123" }, userAddress: { eq: "456" }, - contractType: { eq: "airdrop" }, + contractType: { eq: "" }, }, limit: 1, }, From a12ba71fb821c1939a60be978bdc3386a43d7f13 Mon Sep 17 00:00:00 2001 From: elshenak Date: Tue, 12 Mar 2024 05:24:09 -0400 Subject: [PATCH 3/4] test: fix --- src/gql/heart-monitor/heart-monitor.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gql/heart-monitor/heart-monitor.test.ts b/src/gql/heart-monitor/heart-monitor.test.ts index 06d536a4..d86a020c 100644 --- a/src/gql/heart-monitor/heart-monitor.test.ts +++ b/src/gql/heart-monitor/heart-monitor.test.ts @@ -1180,7 +1180,6 @@ test("wasm", async () => { where: { contractAddress: { like: "123" }, userAddress: { eq: "456" }, - contractType: { eq: "" }, }, limit: 1, }, From 866c603be250b06f10ead37bc7859a34b9ad4547 Mon Sep 17 00:00:00 2001 From: Cameron Gilbert Date: Mon, 18 Mar 2024 15:26:13 -0400 Subject: [PATCH 4/4] feat: trigger latest build (#340) --- scripts/build.sh | 6 +++++- src/gql/query/index.ts | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 2e5eff49..014725d5 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -7,11 +7,15 @@ if [ -d "./nibiru/" ]; then cd nibiru git checkout main cd .. -else +elif [ -d "../nibiru/" ]; then cd ../nibiru git checkout main git pull cd ../ts-sdk +else + cd .. + git clone git@github.com:NibiruChain/nibiru.git + cd ts-sdk fi yarn gql-generate & yarn proto-gen diff --git a/src/gql/query/index.ts b/src/gql/query/index.ts index fd5d833e..c1fe4cb9 100644 --- a/src/gql/query/index.ts +++ b/src/gql/query/index.ts @@ -9,8 +9,8 @@ export * from "./featureFlags" export * from "./governance" export * from "./ibc" export * from "./inflation" -export * from "./markPriceCandles" export * from "./marketing" +export * from "./markPriceCandles" export * from "./oracle" export * from "./perp" export * from "./redelegations" @@ -18,8 +18,8 @@ export * from "./spotLpPositions" export * from "./spotPoolCreated" export * from "./spotPoolExited" export * from "./spotPoolJoined" -export * from "./spotPoolSwap" export * from "./spotPools" +export * from "./spotPoolSwap" export * from "./stats" export * from "./unbondings" export * from "./users"