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

Jump to bottom

Additional cleanup to support tokens UI #313

Merged
merged 8 commits into from
Nov 9, 2021
Merged

Additional cleanup to support tokens UI #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1cb2104
Add "fromOrTo" query param to token transfers
awrichar Nov 2, 2021
5843eb3
Validate name field on new token pools
awrichar Nov 2, 2021
72549d0
Replace join column pool_protocol_id with pool_id instead
awrichar Nov 2, 2021
fb19d5d
Reduce code duplication in token_transfer
awrichar Nov 2, 2021
6f38314
Reorder indexes on tokenbalance
awrichar Nov 3, 2021
63a3a1a
Add route to get all pools held by a token account
awrichar Nov 3, 2021
6f98c40
Use WriteByte instead of WriteRune when possible
awrichar Nov 4, 2021
3089b5f
Merge branch 'main' of github.com:hyperledger/firefly into balances
awrichar Nov 4, 2021
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
2 changes: 1 addition & 1 deletion db/migrations/postgres/000032_create_tokenaccount_table.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ CREATE TABLE tokenaccount (
balance VARCHAR(65)
);

CREATE UNIQUE INDEX tokenaccount_pool ON tokenaccount(pool_protocol_id,token_index,identity);
CREATE UNIQUE INDEX tokenaccount_pool ON tokenaccount(identity,pool_protocol_id,token_index);

COMMIT;
24 changes: 24 additions & 0 deletions db/migrations/postgres/000043_replace_token_poolprotocolid.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
BEGIN;
DROP INDEX tokenbalance_pool;
DROP INDEX tokentransfer_pool;

ALTER TABLE tokenbalance ADD COLUMN pool_protocol_id VARCHAR(1024);
ALTER TABLE tokentransfer ADD COLUMN pool_protocol_id VARCHAR(1024);

UPDATE tokenbalance SET pool_protocol_id = pool.protocol_id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokenbalance.pool_id = pool.id;

UPDATE tokentransfer SET pool_protocol_id = pool.protocol_id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokentransfer.pool_id = pool.id;

ALTER TABLE tokenbalance DROP COLUMN pool_id;
ALTER TABLE tokentransfer DROP COLUMN pool_id;

ALTER TABLE tokenbalance ALTER COLUMN pool_protocol_id SET NOT NULL;
ALTER TABLE tokentransfer ALTER COLUMN pool_protocol_id SET NOT NULL;

CREATE UNIQUE INDEX tokenaccount_pool ON tokenbalance(key,pool_protocol_id,token_index);
CREATE INDEX tokentransfer_pool ON tokentransfer(pool_protocol_id,token_index);
COMMIT;
24 changes: 24 additions & 0 deletions db/migrations/postgres/000043_replace_token_poolprotocolid.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
BEGIN;
DROP INDEX tokenaccount_pool;
DROP INDEX tokentransfer_pool;

ALTER TABLE tokenbalance ADD COLUMN pool_id UUID;
ALTER TABLE tokentransfer ADD COLUMN pool_id UUID;

UPDATE tokenbalance SET pool_id = pool.id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokenbalance.pool_protocol_id = pool.protocol_id;

UPDATE tokentransfer SET pool_id = pool.id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokentransfer.pool_protocol_id = pool.protocol_id;

ALTER TABLE tokenbalance DROP COLUMN pool_protocol_id;
ALTER TABLE tokentransfer DROP COLUMN pool_protocol_id;

ALTER TABLE tokenbalance ALTER COLUMN pool_id SET NOT NULL;
ALTER TABLE tokentransfer ALTER COLUMN pool_id SET NOT NULL;

CREATE UNIQUE INDEX tokenbalance_pool ON tokenbalance(key,pool_id,token_index);
CREATE INDEX tokentransfer_pool ON tokentransfer(pool_id,token_index);
COMMIT;
2 changes: 1 addition & 1 deletion db/migrations/sqlite/000032_create_tokenaccount_table.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ CREATE TABLE tokenaccount (
balance VARCHAR(65)
);

CREATE UNIQUE INDEX tokenaccount_pool ON tokenaccount(pool_protocol_id,token_index,identity);
CREATE UNIQUE INDEX tokenaccount_pool ON tokenaccount(identity,pool_protocol_id,token_index);
19 changes: 19 additions & 0 deletions db/migrations/sqlite/000043_replace_token_poolprotocolid.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
DROP INDEX tokenbalance_pool;
DROP INDEX tokentransfer_pool;

ALTER TABLE tokenbalance ADD COLUMN pool_protocol_id VARCHAR(1024);
ALTER TABLE tokentransfer ADD COLUMN pool_protocol_id VARCHAR(1024);

UPDATE tokenbalance SET pool_protocol_id = pool.protocol_id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokenbalance.pool_id = pool.id;

UPDATE tokentransfer SET pool_protocol_id = pool.protocol_id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokentransfer.pool_id = pool.id;

ALTER TABLE tokenbalance DROP COLUMN pool_id;
ALTER TABLE tokentransfer DROP COLUMN pool_id;

CREATE UNIQUE INDEX tokenaccount_pool ON tokenbalance(key,pool_protocol_id,token_index);
CREATE INDEX tokentransfer_pool ON tokentransfer(pool_protocol_id,token_index);
19 changes: 19 additions & 0 deletions db/migrations/sqlite/000043_replace_token_poolprotocolid.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
DROP INDEX tokenaccount_pool;
DROP INDEX tokentransfer_pool;

ALTER TABLE tokenbalance ADD COLUMN pool_id UUID;
ALTER TABLE tokentransfer ADD COLUMN pool_id UUID;

UPDATE tokenbalance SET pool_id = pool.id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokenbalance.pool_protocol_id = pool.protocol_id;

UPDATE tokentransfer SET pool_id = pool.id
FROM (SELECT protocol_id, id FROM tokenpool) AS pool
WHERE tokentransfer.pool_protocol_id = pool.protocol_id;

ALTER TABLE tokenbalance DROP COLUMN pool_protocol_id;
ALTER TABLE tokentransfer DROP COLUMN pool_protocol_id;

CREATE UNIQUE INDEX tokenbalance_pool ON tokenbalance(key,pool_id,token_index);
CREATE INDEX tokentransfer_pool ON tokentransfer(pool_id,token_index);
Loading