fix(api): Policy isDraft field

zallo-labs · Jul 28, 2024 · 422de4f · 422de4f
1 parent 24bf632
commit 422de4f
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 171 deletions.
diff --git a/api/dbschema/bootstrap.md b/api/dbschema/bootstrap.md
@@ -12,4 +12,4 @@ configure instance set query_work_mem := <cfg::memory>"8MiB";
 configure instance set shared_buffers := <cfg::memory>"2GiB";
 
 # Total memory available to the database for caching - 75%
-configure instance set effective_cache_size := <cfg::memory>"3GiB";
+configure instance set effective_cache_size := <cfg::memory>"6GiB";
diff --git a/api/dbschema/edgeql-js/__spec__.ts b/api/dbschema/edgeql-js/__spec__.ts
diff --git a/api/dbschema/edgeql-js/modules/default.ts b/api/dbschema/edgeql-js/modules/default.ts
diff --git a/api/dbschema/interfaces.ts b/api/dbschema/interfaces.ts
@@ -215,9 +215,9 @@ export namespace $default {
  "proposal"?: Transaction | null;
  "initState": boolean;
  "isActive": boolean;
- "isDraft": boolean;
  "latest"?: PolicyState | null;
  "isLatest": boolean;
+ "isDraft": boolean;
  }
  export interface Policy extends PolicyState {
  "approvers": Approver[];

diff --git a/api/dbschema/migrations/00002-m1ob6ar.edgeql b/api/dbschema/migrations/00002-m1ob6ar.edgeql
@@ -0,0 +1,9 @@
+CREATE MIGRATION m1ob6arfwyamzcpgk2hgzhby3iwv3moewthqacorsw2mtyjkopdoaq
+ ONTO m13qxppnkqofigih7dxkipm2lh6k3ahrqerachqhdzihw76nb6i3aa
+{
+ ALTER TYPE default::PolicyState {
+ ALTER PROPERTY isDraft {
+ USING ((__source__ ?= .draft));
+ };
+ };
+};
diff --git a/api/dbschema/policy.esdl b/api/dbschema/policy.esdl
@@ -19,7 +19,7 @@ module default {
  required initState := .activationBlock ?= 0;
  required hasBeenActive := exists .activationBlock;
  required isActive := .isLatest and .hasBeenActive;
- required isDraft := exists .draft;
+ required isDraft := (__source__ ?= .draft);
  latest := (__source__ if .isLatest else latestPolicy(.account, .key));
  draft := assert_single((
  with account := __source__.account, key := __source__.key
@@ -94,9 +94,9 @@ module default {
  }
 
  type TransfersConfig {
- multi limits: TransferLimit { constraint exclusive; }
  required defaultAllow: bool { default := true; };
  required budget: uint32;
+ multi limits: TransferLimit { constraint exclusive; }
  }
 
  type TransferLimit {

diff --git a/api/edgedb.toml b/api/edgedb.toml
@@ -1,2 +1,2 @@
 [edgedb]
-server-version = "5.4"
+server-version = "5.6"
diff --git a/api/src/feat/transactions/delete-transaction.query.ts b/api/src/feat/transactions/delete-transaction.query.ts
@@ -1,32 +1,28 @@
 // GENERATED by @edgedb/generate v0.5.3
 
-import type { Executor } from 'edgedb';
+import type {Executor} from "edgedb";
 
 export type DeleteTransactionArgs = {
- readonly transaction: string;
+ readonly "transaction": string;
 };
 
 export type DeleteTransactionReturns = {
- transaction: {
- id: string;
- account: {
- address: string;
+ "transaction": {
+ "id": string;
+ "account": {
+ "address": string;
  };
  } | null;
- deletedPolicies: Array<{
- id: string;
+ "deletedPolicies": Array<{
+ "id": string;
  }>;
- deletedTransaction: {
- id: string;
+ "deletedTransaction": {
+ "id": string;
  } | null;
 };
 
-export function deleteTransaction(
- client: Executor,
- args: DeleteTransactionArgs,
-): Promise<DeleteTransactionReturns> {
- return client.queryRequiredSingle(
- `\
+export function deleteTransaction(client: Executor, args: DeleteTransactionArgs): Promise<DeleteTransactionReturns> {
+ return client.queryRequiredSingle(`\
 with t := (select Transaction filter .id = <uuid>$transaction)
 select {
  transaction := (
@@ -35,9 +31,9 @@ select {
  account: { address }
  }
  ),
+ # Delete policies the proposal was going to activate
  deletedPolicies := (delete t.<proposal[is PolicyState]),
  deletedTransaction := (delete t)
-};`,
- args,
- );
+};`, args);
+
 }