Fix SQL query to check for empty storage value.
This commit is contained in:
parent
f09f665b11
commit
500bba43b4
@ -1,18 +1,26 @@
|
|||||||
-- +goose Up
|
-- +goose Up
|
||||||
|
|
||||||
|
|
||||||
-- +goose StatementBegin
|
-- +goose StatementBegin
|
||||||
-- returns if a storage node at the provided path was removed in the range >= the provided height and <= the provided block hash
|
-- returns if a state leaf node was removed within the provided block number
|
||||||
CREATE OR REPLACE FUNCTION was_state_leaf_removed(state_leaf_key BYTEA, block_num BIGINT) RETURNS BOOLEAN
|
CREATE OR REPLACE FUNCTION was_state_leaf_removed(key character varying, hash character varying) RETURNS boolean
|
||||||
|
LANGUAGE plpgsql
|
||||||
AS $$
|
AS $$
|
||||||
SELECT exists(SELECT 1
|
DECLARE
|
||||||
FROM eth.state_cids
|
rec RECORD;
|
||||||
INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
|
BEGIN
|
||||||
WHERE state_leaf_key = state_leaf_key
|
FOR rec IN SELECT state_cids.node_type
|
||||||
AND block_number <= block_num
|
FROM eth.state_cids
|
||||||
AND state_cids.node_type = 3
|
INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
|
||||||
LIMIT 1);
|
WHERE state_leaf_key = key
|
||||||
$$ LANGUAGE SQL;
|
AND block_number <= (SELECT block_number FROM eth.header_cids WHERE block_hash = hash)
|
||||||
|
ORDER BY state_cids.id DESC LIMIT 1
|
||||||
|
LOOP
|
||||||
|
IF rec.node_type = 3 THEN
|
||||||
|
RETURN TRUE;
|
||||||
|
END IF;
|
||||||
|
END LOOP;
|
||||||
|
RETURN FALSE;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
-- +goose StatementEnd
|
-- +goose StatementEnd
|
||||||
|
|
||||||
-- +goose StatementBegin
|
-- +goose StatementBegin
|
||||||
|
@ -20,7 +20,7 @@ services:
|
|||||||
restart: on-failure
|
restart: on-failure
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
image: vulcanize/statediff-migrations:v0.7.0
|
image: vulcanize/statediff-migrations:0.7.0
|
||||||
environment:
|
environment:
|
||||||
DATABASE_USER: vdbm
|
DATABASE_USER: vdbm
|
||||||
DATABASE_NAME: vulcanize_public
|
DATABASE_NAME: vulcanize_public
|
||||||
@ -39,7 +39,6 @@ services:
|
|||||||
- vdb_db_eth_server:/var/lib/postgresql/data
|
- vdb_db_eth_server:/var/lib/postgresql/data
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:8077:5432"
|
- "127.0.0.1:8077:5432"
|
||||||
command: ["postgres", "-c", "log_statement=all"]
|
|
||||||
|
|
||||||
eth-server:
|
eth-server:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
@ -127,7 +127,7 @@ const (
|
|||||||
AND block_number <= $2
|
AND block_number <= $2
|
||||||
ORDER BY block_number DESC
|
ORDER BY block_number DESC
|
||||||
LIMIT 1`
|
LIMIT 1`
|
||||||
RetrieveStorageLeafByAddressHashAndLeafKeyAndBlockNumberPgStr = `SELECT storage_cids.cid, data, storage_cids.node_type, was_state_leaf_removed(state_leaf_key, block_number) AS state_leaf_removed
|
RetrieveStorageLeafByAddressHashAndLeafKeyAndBlockNumberPgStr = `SELECT storage_cids.cid, data, storage_cids.node_type, was_state_leaf_removed($1, $3) AS state_leaf_removed
|
||||||
FROM eth.storage_cids
|
FROM eth.storage_cids
|
||||||
INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
|
INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
|
||||||
INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
|
INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
|
||||||
@ -137,7 +137,7 @@ const (
|
|||||||
AND block_number <= $3
|
AND block_number <= $3
|
||||||
ORDER BY block_number DESC
|
ORDER BY block_number DESC
|
||||||
LIMIT 1`
|
LIMIT 1`
|
||||||
RetrieveStorageLeafByAddressHashAndLeafKeyAndBlockHashPgStr = `SELECT storage_cids.cid, data, storage_cids.node_type, was_state_leaf_removed(state_leaf_key, block_number) AS state_leaf_removed
|
RetrieveStorageLeafByAddressHashAndLeafKeyAndBlockHashPgStr = `SELECT storage_cids.cid, data, storage_cids.node_type, was_state_leaf_removed($1, $3) AS state_leaf_removed
|
||||||
FROM eth.storage_cids
|
FROM eth.storage_cids
|
||||||
INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
|
INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
|
||||||
INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
|
INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
|
||||||
|
@ -7,7 +7,7 @@ docker-compose down --remove-orphans --volumes
|
|||||||
# Build and start the containers.
|
# Build and start the containers.
|
||||||
# Note: Build only if `ipld-eth-server` or other container code is modified. Otherwise comment this line.
|
# Note: Build only if `ipld-eth-server` or other container code is modified. Otherwise comment this line.
|
||||||
docker-compose -f docker-compose.test.yml -f docker-compose.yml build eth-server
|
docker-compose -f docker-compose.test.yml -f docker-compose.yml build eth-server
|
||||||
docker-compose -f docker-compose.test.yml -f docker-compose.yml up -d db dapptools contract eth-server 2>&1 | tee docker.logs
|
docker-compose -f docker-compose.test.yml -f docker-compose.yml up -d db dapptools contract eth-server
|
||||||
|
|
||||||
export PGPASSWORD=password
|
export PGPASSWORD=password
|
||||||
export DATABASE_USER=vdbm
|
export DATABASE_USER=vdbm
|
||||||
|
@ -15,8 +15,6 @@ fastify.get('/v1/deployContract', async (req, reply) => {
|
|||||||
const token = await GLDToken.deploy();
|
const token = await GLDToken.deploy();
|
||||||
await token.deployed();
|
await token.deployed();
|
||||||
|
|
||||||
console.log(`Deployed block ${token.deployTransaction.blockNumber}`)
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
address: token.address,
|
address: token.address,
|
||||||
txHash: token.deployTransaction.hash,
|
txHash: token.deployTransaction.hash,
|
||||||
@ -33,7 +31,6 @@ fastify.get('/v1/destroyContract', async (req, reply) => {
|
|||||||
|
|
||||||
await token.destroy();
|
await token.destroy();
|
||||||
const blockNum = await hre.ethers.provider.getBlockNumber()
|
const blockNum = await hre.ethers.provider.getBlockNumber()
|
||||||
console.log(`Destroyed block ${blockNum}`)
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
blockNumber: blockNum,
|
blockNumber: blockNum,
|
||||||
|
@ -54,7 +54,6 @@ func DestroyContract(addr string) (*ContractDestroyed, error) {
|
|||||||
}
|
}
|
||||||
defer res.Body.Close()
|
defer res.Body.Close()
|
||||||
|
|
||||||
fmt.Println(res.Body)
|
|
||||||
var data ContractDestroyed
|
var data ContractDestroyed
|
||||||
decoder := json.NewDecoder(res.Body)
|
decoder := json.NewDecoder(res.Body)
|
||||||
|
|
||||||
|
@ -2,7 +2,6 @@ package integration_test
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"math/big"
|
"math/big"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -318,8 +317,6 @@ var _ = Describe("Integration test", func() {
|
|||||||
contract, contractErr = integration.DeployContract()
|
contract, contractErr = integration.DeployContract()
|
||||||
erc20TotalSupply, bigIntResult = new(big.Int).SetString("1000000000000000000000", 10)
|
erc20TotalSupply, bigIntResult = new(big.Int).SetString("1000000000000000000000", 10)
|
||||||
|
|
||||||
fmt.Printf("Deployed address: %d\n", contract.BlockNumber)
|
|
||||||
|
|
||||||
time.Sleep(sleepInterval)
|
time.Sleep(sleepInterval)
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -396,7 +393,7 @@ var _ = Describe("Integration test", func() {
|
|||||||
Expect(gethStorage).To(Equal(ipldStorage))
|
Expect(gethStorage).To(Equal(ipldStorage))
|
||||||
})
|
})
|
||||||
|
|
||||||
FIt("get storage after self destruct", func() {
|
It("get storage after self destruct", func() {
|
||||||
totalSupplyIndex := "0x2"
|
totalSupplyIndex := "0x2"
|
||||||
|
|
||||||
tx, err := integration.DestroyContract(contract.Address)
|
tx, err := integration.DestroyContract(contract.Address)
|
||||||
@ -404,10 +401,6 @@ var _ = Describe("Integration test", func() {
|
|||||||
|
|
||||||
time.Sleep(sleepInterval)
|
time.Sleep(sleepInterval)
|
||||||
|
|
||||||
fmt.Printf("Destroyed address: %d\n", tx.BlockNumber)
|
|
||||||
|
|
||||||
fmt.Printf("Contract Address: %s \n", contract.Address)
|
|
||||||
|
|
||||||
gethStorage1, err := gethClient.StorageAt(ctx, common.HexToAddress(contract.Address), common.HexToHash(totalSupplyIndex), big.NewInt(tx.BlockNumber-1))
|
gethStorage1, err := gethClient.StorageAt(ctx, common.HexToAddress(contract.Address), common.HexToHash(totalSupplyIndex), big.NewInt(tx.BlockNumber-1))
|
||||||
Expect(err).ToNot(HaveOccurred())
|
Expect(err).ToNot(HaveOccurred())
|
||||||
gethStorage2, err := gethClient.StorageAt(ctx, common.HexToAddress(contract.Address), common.HexToHash(totalSupplyIndex), big.NewInt(tx.BlockNumber))
|
gethStorage2, err := gethClient.StorageAt(ctx, common.HexToAddress(contract.Address), common.HexToHash(totalSupplyIndex), big.NewInt(tx.BlockNumber))
|
||||||
|
Loading…
Reference in New Issue
Block a user