Merge remote-tracking branch 'upstream/master' into orion_signup-flow…

…-rework

.env

@@ -62,6 +62,9 @@ TRUST_PROXY=uniquelocal
 SENDGRID_API_KEY=
 SENDGRID_FROM_EMAIL=gateway@example.com
 
+# Detectlanguage 
+DETECTLANGUAGE_API_KEY=
+
 # Debug settings
 SQD_DEBUG=api:*
 

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 4.0.6
+
+## Bug Fixes:
+- Fixed: Set `Notification.dispatchBlock` field for all type of notifications (both future and immediate), to allow querying notifications by block number at which they should be delivered - [#344](https://github.com/Joystream/orion/pull/344)
+
+# 4.0.5
+
+## Bug Fixes:
+- Fixed: avoiding IDs override/conflict while creating concurrent runtime notifications by reading/updating the `nextEntityId` from the `overlay` instead of DB - [#342](https://github.com/Joystream/orion/pull/342)
+- Fixed: removed possibility of creating duplicate CRT notifications in `processAmmActivatedEvent` and `processTokenSaleInitializedEvent` mappings if the account being notified is both channel follower as well as token holder - [#343](https://github.com/Joystream/orion/pull/343)
+
+# 4.0.4
+
+## Bug Fixes:
+- Fixed: improve the accuracy of `Video.orionLanguage` field by reworking the `predictVideoLanguage` function in `src/utils/language.ts`
+
 # 4.0.3
 
 ## Misc

db/generateViewsMigration.js

@@ -14,6 +14,13 @@ module.exports = class ${className} {
  name = '${className}'
 
  async up(db) {
+ // these two queries will be invoked and the cleaned up by the squid itself
+ // we only do this to be able to reference processor height in mappings 
+ await db.query(\`CREATE SCHEMA IF NOT EXISTS squid_processor;\`)
+ await db.query(\`CREATE TABLE IF NOT EXISTS squid_processor.status (
+ id SERIAL PRIMARY KEY,
+ height INT
+ );\`)
  const viewDefinitions = getViewDefinitions(db);
  for (const [tableName, viewConditions] of Object.entries(viewDefinitions)) {
  if (Array.isArray(viewConditions)) {

db/migrations/1720623003671-Data.js

@@ -0,0 +1,11 @@
+module.exports = class Data1720623003671 {
+ name = 'Data1720623003671'
+
+ async up(db) {
+ await db.query(`CREATE TABLE "admin"."orion_offchain_cursor" ("cursor_name" character varying NOT NULL, "value" bigint NOT NULL, CONSTRAINT "PK_7083797352af5a21224b6c8ccbc" PRIMARY KEY ("cursor_name"))`)
+ }
+
+ async down(db) {
+ await db.query(`DROP TABLE "admin"."orion_offchain_cursor"`)
+ }
+}

db/migrations/1721141313646-Data.js

@@ -0,0 +1,19 @@
+module.exports = class Data1721141313646 {
+ name = 'Data1721141313646'
+
+ async up(db) {
+ await db.query(`CREATE TABLE "admin"."user_interaction_count" ("id" character varying NOT NULL, "type" text, "entity_id" text, "day_timestamp" TIMESTAMP WITH TIME ZONE NOT NULL, "count" integer NOT NULL, CONSTRAINT "PK_8e334a51febcf02c54dff48147d" PRIMARY KEY ("id"))`)
+ await db.query(`CREATE INDEX "IDX_b5261af5f3fe48d77086ebc602" ON "admin"."user_interaction_count" ("day_timestamp") `)
+ await db.query(`CREATE TABLE "admin"."marketplace_token" ("liquidity" integer, "market_cap" numeric, "cumulative_revenue" numeric, "amm_volume" numeric, "price_change" numeric, "liquidity_change" numeric, "id" character varying NOT NULL, "status" character varying(6) NOT NULL, "avatar" jsonb, "total_supply" numeric NOT NULL, "is_featured" boolean NOT NULL, "symbol" text, "is_invite_only" boolean NOT NULL, "annual_creator_reward_permill" integer NOT NULL, "revenue_share_ratio_permill" integer NOT NULL, "created_at" TIMESTAMP WITH TIME ZONE NOT NULL, "channel_id" text, "description" text, "whitelist_applicant_note" text, "whitelist_applicant_link" text, "accounts_num" integer NOT NULL, "number_of_revenue_share_activations" integer NOT NULL, "deissued" boolean NOT NULL, "current_amm_sale_id" text, "current_sale_id" text, "current_revenue_share_id" text, "number_of_vested_transfer_issued" integer NOT NULL, "last_price" numeric, CONSTRAINT "PK_d836a8c3d907b67099c140c4d84" PRIMARY KEY ("id"))`)
+ await db.query(`CREATE INDEX "IDX_1268fd020cf195b2e8d5d85093" ON "admin"."marketplace_token" ("symbol") `)
+ await db.query(`CREATE INDEX "IDX_b99bb1ecee77f23016f6ef687c" ON "admin"."marketplace_token" ("created_at") `)
+ }
+
+ async down(db) {
+ await db.query(`DROP TABLE "admin"."user_interaction_count"`)
+ await db.query(`DROP INDEX "admin"."IDX_b5261af5f3fe48d77086ebc602"`)
+ await db.query(`DROP TABLE "admin"."marketplace_token"`)
+ await db.query(`DROP INDEX "admin"."IDX_1268fd020cf195b2e8d5d85093"`)
+ await db.query(`DROP INDEX "admin"."IDX_b99bb1ecee77f23016f6ef687c"`)
+ }
+}

db/migrations/1710699134312-Data.js → db/migrations/1722676430400-Data.js

@@ -1,5 +1,5 @@
-module.exports = class Data1710699134312 {
- name = 'Data1710699134312'
+module.exports = class Data1722676430400 {
+ name = 'Data1722676430400'
 
  async up(db) {
  await db.query(`ALTER TABLE "admin"."account" DROP CONSTRAINT "FK_601b93655bcbe73cb58d8c80cd3"`)

db/migrations/1710699134452-Views.js → db/migrations/1722676430521-Views.js

@@ -1,10 +1,17 @@
 
 const { getViewDefinitions } = require('../viewDefinitions')
 
-module.exports = class Views1710699134452 {
- name = 'Views1710699134452'
+module.exports = class Views1722676430521 {
+ name = 'Views1722676430521'
 
  async up(db) {
+ // these two queries will be invoked and the cleaned up by the squid itself
+ // we only do this to be able to reference processor height in mappings 
+ await db.query(`CREATE SCHEMA IF NOT EXISTS squid_processor;`)
+ await db.query(`CREATE TABLE IF NOT EXISTS squid_processor.status (
+ id SERIAL PRIMARY KEY,
+ height INT
+ );`)
  const viewDefinitions = getViewDefinitions(db);
  for (const [tableName, viewConditions] of Object.entries(viewDefinitions)) {
  if (Array.isArray(viewConditions)) {

db/viewDefinitions.js

@@ -2,6 +2,8 @@ const noCategoryVideosSupportedByDefault =
  process.env.SUPPORT_NO_CATEGORY_VIDEOS === 'true' ||
  process.env.SUPPORT_NO_CATEGORY_VIDEOS === '1'
 
+const BLOCKS_PER_DAY = 10 * 60 * 24 // 10 blocs per minute, 60 mins * 24 hours
+
 // Add public 'VIEW' definitions for hidden entities created by
 // applying `@schema(name: "admin") directive to the Graphql entities
 function getViewDefinitions(db) {
@@ -87,6 +89,102 @@ function getViewDefinitions(db) {
  email_delivery_attempt: ['FALSE'],
  // TODO (notifications v2): make this part of the admin schema with appropriate resolver for queries
  // notification: ['FALSE'],
+ marketplace_token: `
+ WITH trading_volumes AS
+ (SELECT ac.token_id,
+ SUM(tr.price_paid) as amm_volume
+ FROM amm_transaction tr
+ JOIN amm_curve ac ON ac.id = tr.amm_id
+ GROUP BY token_id),
+
+ base_price_transaction AS (
+ WITH oldest_transactions AS (
+ SELECT DISTINCT ON (ac.token_id) 
+ tr.amm_id,
+ ac.token_id,
+ tr.price_per_unit AS oldest_price_paid,
+ tr.created_in
+ FROM amm_transaction tr
+ JOIN amm_curve ac ON tr.amm_id = ac.id
+ WHERE tr.created_in < (SELECT height FROM squid_processor.status) - ${
+ BLOCKS_PER_DAY * 30
+ }
+ ORDER BY ac.token_id, tr.created_in DESC
+ ),
+ fallback_transactions AS (
+ SELECT DISTINCT ON (ac.token_id) 
+ tr.amm_id,
+ ac.token_id,
+ tr.price_per_unit AS oldest_price_paid,
+ tr.created_in
+ FROM amm_transaction tr
+ JOIN amm_curve ac ON tr.amm_id = ac.id
+ WHERE tr.created_in > (SELECT height FROM squid_processor.status) - ${
+ BLOCKS_PER_DAY * 30
+ }
+ ORDER BY ac.token_id, tr.created_in ASC
+ )
+ SELECT * FROM oldest_transactions
+ UNION ALL
+ SELECT * FROM fallback_transactions
+ WHERE NOT EXISTS (SELECT 1 FROM oldest_transactions)
+ )
+
+ SELECT 
+ COALESCE(ac.total_liq, 0) as liquidity,
+ COALESCE((ct.last_price * ct.total_supply), 0) as market_cap,
+ c.cumulative_revenue,
+ c.id as channel_id,
+ COALESCE(tv.amm_volume, 0) as amm_volume,
+ CASE
+ WHEN ldt_o.oldest_price_paid = 0
+ OR ldt_o.oldest_price_paid IS NULL THEN 0
+ ELSE ((ct.last_price - ldt_o.oldest_price_paid) * 100.0 / ldt_o.oldest_price_paid)
+ END AS price_change,
+ CASE
+ WHEN liq_until.quantity IS NULL THEN 0
+ ELSE ((ac.total_liq - liq_until.quantity) * 100 / GREATEST(liq_until.quantity, 1))
+ END as liquidity_change,
+ ct.*
+ FROM creator_token ct
+ LEFT JOIN token_channel tc ON tc.token_id = ct.id
+ LEFT JOIN channel c ON c.id = tc.channel_id
+ LEFT JOIN base_price_transaction ldt_o ON ldt_o.token_id = ct.id
+ LEFT JOIN
+
+ (SELECT token_id,
+ SUM(CASE
+ WHEN transaction_type = 'BUY' THEN quantity
+ ELSE quantity * -1
+ END) AS total_liq
+ FROM
+ (SELECT ac.token_id,
+ tr.transaction_type,
+ tr.quantity
+ FROM amm_transaction tr
+ JOIN amm_curve ac ON tr.amm_id = ac.id) as tr
+ GROUP BY token_id) as ac ON ac.token_id = ct.id
+
+ LEFT JOIN
+
+ (SELECT token_id,
+ SUM(CASE
+ WHEN transaction_type = 'BUY' THEN quantity
+ ELSE quantity * -1
+ END) AS quantity
+ FROM
+ (SELECT ac.token_id,
+ tr.transaction_type,
+ tr.quantity
+ FROM amm_transaction tr
+ JOIN amm_curve ac ON tr.amm_id = ac.id
+ WHERE tr.created_in <
+ (SELECT height
+ FROM squid_processor.status) - ${BLOCKS_PER_DAY * 30}) as tr
+ GROUP BY token_id) as liq_until ON liq_until.token_id = ct.id
+
+ LEFT JOIN trading_volumes tv ON tv.token_id = ct.id
+ `,
  }
 }