mirror of
https://github.com/aljazceru/ark.git
synced 2025-12-18 12:44:19 +01:00
New address encoding (#356)
* [common] rework address encoding * new address encoding * replace offchain address by vtxo output key in DB * merge migrations files into init one * fix txbuilder fixtures * fix transaction events
This commit is contained in:
@@ -21,11 +21,11 @@ CREATE TABLE IF NOT EXISTS payment (
|
||||
|
||||
CREATE TABLE IF NOT EXISTS receiver (
|
||||
payment_id TEXT NOT NULL,
|
||||
pubkey TEXT NOT NULL,
|
||||
pubkey TEXT,
|
||||
onchain_address TEXT,
|
||||
amount INTEGER NOT NULL,
|
||||
onchain_address TEXT NOT NULL,
|
||||
FOREIGN KEY (payment_id) REFERENCES payment(id),
|
||||
PRIMARY KEY (payment_id, pubkey)
|
||||
PRIMARY KEY (payment_id, pubkey, onchain_address)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS tx (
|
||||
@@ -54,6 +54,7 @@ CREATE TABLE IF NOT EXISTS vtxo (
|
||||
expire_at INTEGER NOT NULL,
|
||||
payment_id TEXT,
|
||||
redeem_tx TEXT,
|
||||
pending BOOLEAN NOT NULL,
|
||||
PRIMARY KEY (txid, vout),
|
||||
FOREIGN KEY (payment_id) REFERENCES payment(id)
|
||||
);
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
CREATE TABLE IF NOT EXISTS old_receiver (
|
||||
payment_id TEXT NOT NULL,
|
||||
pubkey TEXT NOT NULL,
|
||||
amount INTEGER NOT NULL,
|
||||
onchain_address TEXT NOT NULL,
|
||||
FOREIGN KEY (payment_id) REFERENCES payment(id),
|
||||
PRIMARY KEY (payment_id, pubkey)
|
||||
);
|
||||
|
||||
INSERT INTO old_receiver SELECT * FROM receiver;
|
||||
|
||||
DROP TABLE receiver;
|
||||
|
||||
ALTER TABLE old_receiver RENAME TO receiver;
|
||||
|
||||
ALTER TABLE vtxo DROP COLUMN descriptor;
|
||||
ALTER TABLE vtxo ADD COLUMN pubkey TEXT NOT NULL;
|
||||
@@ -1,28 +0,0 @@
|
||||
CREATE TABLE IF NOT EXISTS new_receiver (
|
||||
payment_id TEXT NOT NULL,
|
||||
descriptor TEXT NOT NULL,
|
||||
amount INTEGER NOT NULL,
|
||||
onchain_address TEXT NOT NULL,
|
||||
FOREIGN KEY (payment_id) REFERENCES payment(id),
|
||||
PRIMARY KEY (payment_id, descriptor)
|
||||
);
|
||||
|
||||
INSERT INTO new_receiver SELECT * FROM receiver;
|
||||
|
||||
DROP VIEW payment_vtxo_vw;
|
||||
DROP VIEW payment_receiver_vw;
|
||||
DROP TABLE receiver;
|
||||
ALTER TABLE new_receiver RENAME TO receiver;
|
||||
|
||||
ALTER TABLE vtxo ADD COLUMN descriptor TEXT;
|
||||
ALTER TABLE vtxo DROP COLUMN pubkey;
|
||||
|
||||
CREATE VIEW payment_vtxo_vw AS SELECT vtxo.*
|
||||
FROM payment
|
||||
LEFT OUTER JOIN vtxo
|
||||
ON payment.id=vtxo.payment_id;
|
||||
|
||||
CREATE VIEW payment_receiver_vw AS SELECT receiver.*
|
||||
FROM payment
|
||||
LEFT OUTER JOIN receiver
|
||||
ON payment.id=receiver.payment_id;
|
||||
@@ -1 +0,0 @@
|
||||
ALTER TABLE vtxo DROP COLUMN pending;
|
||||
@@ -1,14 +0,0 @@
|
||||
ALTER TABLE vtxo ADD COLUMN pending BOOLEAN NOT NULL;
|
||||
|
||||
DROP VIEW payment_vtxo_vw;
|
||||
DROP VIEW payment_receiver_vw;
|
||||
|
||||
CREATE VIEW payment_vtxo_vw AS SELECT vtxo.*
|
||||
FROM payment
|
||||
LEFT OUTER JOIN vtxo
|
||||
ON payment.id=vtxo.payment_id;
|
||||
|
||||
CREATE VIEW payment_receiver_vw AS SELECT receiver.*
|
||||
FROM payment
|
||||
LEFT OUTER JOIN receiver
|
||||
ON payment.id=receiver.payment_id;
|
||||
Reference in New Issue
Block a user