Merge branch 'v2/cosmos/stargate' of https://github.com/forbole/bdjuno …

…into v2/cosmos/v0.44.x
slandymani · Mar 9, 2022 · 2b2d717 · 2b2d717
2 parents eeb4975 + 395c839
commit 2b2d717
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -13,10 +13,10 @@ all: lint build test-unit
 ###                                Build flags                              ###
 ###############################################################################
 
-LD_FLAGS = -X github.com/forbole/juno/version.Version=$(VERSION) \
-	-X github.com/forbole/juno/version.Commit=$(COMMIT)
+LD_FLAGS = -X github.com/forbole/juno/v2/cmd.Version=$(VERSION) \
+	-X github.com/forbole/juno/v2/cmd.Commit=$(COMMIT)
+BUILD_FLAGS :=  -ldflags '$(LD_FLAGS)'
 
-BUILD_FLAGS := -ldflags '$(LD_FLAGS)'
 
 ###############################################################################
 ###                                  Build                                  ###

diff --git a/database/schema/08-gov.sql b/database/schema/08-gov.sql
@@ -27,10 +27,10 @@ CREATE INDEX proposal_proposer_address_index ON proposal (proposer_address);
 
 CREATE TABLE proposal_deposit
 (
-    proposal_id       INTEGER REFERENCES proposal (id) NOT NULL,
-    depositor_address TEXT REFERENCES account (address),
+    proposal_id       INTEGER NOT NULL REFERENCES proposal (id),
+    depositor_address TEXT             REFERENCES account (address),
     amount            COIN[],
-    height            BIGINT,
+    height            BIGINT  NOT NULL REFERENCES block (height),
     CONSTRAINT unique_deposit UNIQUE (proposal_id, depositor_address)
 );
 CREATE INDEX proposal_deposit_proposal_id_index ON proposal_deposit (proposal_id);
@@ -42,7 +42,7 @@ CREATE TABLE proposal_vote
     proposal_id   INTEGER NOT NULL REFERENCES proposal (id),
     voter_address TEXT    NOT NULL REFERENCES account (address),
     option        TEXT    NOT NULL,
-    height        BIGINT  NOT NULL,
+    height        BIGINT  NOT NULL REFERENCES block (height),
     CONSTRAINT unique_vote UNIQUE (proposal_id, voter_address)
 );
 CREATE INDEX proposal_vote_proposal_id_index ON proposal_vote (proposal_id);

diff --git a/go.mod b/go.mod
@@ -16,9 +16,11 @@ require (
 	github.com/proullon/ramsql v0.0.0-20181213202341-817cee58a244
 	github.com/rs/zerolog v1.26.1
 	github.com/spf13/cobra v1.3.0
+	github.com/spf13/viper v1.10.0
 	github.com/stretchr/testify v1.7.0
 	github.com/tendermint/tendermint v0.34.14
 	google.golang.org/grpc v1.42.0
+	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )