Merge pull request #16 from celenium-io/fix/bitmask-type

Fix: bit mask type
celenium-io · Oct 31, 2023 · 5bfcdcc · 5bfcdcc
2 parents 08d1918 + 4f92e4d
commit 5bfcdcc
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 32 deletions.
diff --git a/internal/storage/block.go b/internal/storage/block.go
@@ -36,7 +36,7 @@ type Block struct {
 	VersionBlock uint64         `bun:"version_block"             comment:"Block version"`
 	VersionApp   uint64         `bun:"version_app"               comment:"App version"`
 
-	MessageTypes types.MsgTypeBits `bun:"message_types,type:bit(73)" comment:"Bit mask with containing messages"`
+	MessageTypes types.MsgTypeBits `bun:"message_types,type:bit(74)" comment:"Bit mask with containing messages"`
 
 	Hash               pkgTypes.Hex `bun:"hash"                 comment:"Block hash"`
 	ParentHash         pkgTypes.Hex `bun:"parent_hash"          comment:"Hash of parent block"`

diff --git a/internal/storage/mock/address.go b/internal/storage/mock/address.go
diff --git a/internal/storage/mock/balance.go b/internal/storage/mock/balance.go
diff --git a/internal/storage/mock/block.go b/internal/storage/mock/block.go
diff --git a/internal/storage/mock/block_stats.go b/internal/storage/mock/block_stats.go
diff --git a/internal/storage/mock/constant.go b/internal/storage/mock/constant.go
diff --git a/internal/storage/mock/denom_metadata.go b/internal/storage/mock/denom_metadata.go
diff --git a/internal/storage/mock/event.go b/internal/storage/mock/event.go
diff --git a/internal/storage/mock/generic.go b/internal/storage/mock/generic.go
diff --git a/internal/storage/mock/message.go b/internal/storage/mock/message.go
diff --git a/internal/storage/mock/namespace.go b/internal/storage/mock/namespace.go
diff --git a/internal/storage/mock/state.go b/internal/storage/mock/state.go
diff --git a/internal/storage/mock/stats.go b/internal/storage/mock/stats.go
diff --git a/internal/storage/mock/tx.go b/internal/storage/mock/tx.go
diff --git a/internal/storage/mock/validator.go b/internal/storage/mock/validator.go
diff --git a/internal/storage/postgres/scopes.go b/internal/storage/postgres/scopes.go
@@ -46,7 +46,7 @@ func txFilter(query *bun.SelectQuery, fltrs storage.TxFilter) *bun.SelectQuery {
 	query = sortScope(query, "id", fltrs.Sort)
 
 	if !fltrs.MessageTypes.Empty() {
-		query = query.Where("bit_count(message_types & ?::bit(73)) > 0", fltrs.MessageTypes)
+		query = query.Where("bit_count(message_types & ?::bit(74)) > 0", fltrs.MessageTypes)
 	}
 
 	if len(fltrs.Status) > 0 {

diff --git a/internal/storage/tx.go b/internal/storage/tx.go
@@ -58,7 +58,7 @@ type Tx struct {
 	Codespace    string            `bun:"codespace,type:text"        comment:"Codespace"                                    stats:"filterable"`
 	Hash         []byte            `bun:"hash"                       comment:"Transaction hash"`
 	Memo         string            `bun:"memo,type:text"             comment:"Note or comment to send with the transaction"`
-	MessageTypes types.MsgTypeBits `bun:"message_types,type:bit(73)" comment:"Bit mask with containing messages"            stats:"filterable"`
+	MessageTypes types.MsgTypeBits `bun:"message_types,type:bit(74)" comment:"Bit mask with containing messages"            stats:"filterable"`
 
 	Messages []Message `bun:"rel:has-many,join:id=tx_id"`
 	Events   []Event   `bun:"rel:has-many"`

diff --git a/internal/storage/types/msg_type_bitmask.go b/internal/storage/types/msg_type_bitmask.go
@@ -637,7 +637,7 @@ var _ driver.Valuer = (*MsgTypeBits)(nil)
 
 func (mask MsgTypeBits) Value() (driver.Value, error) {
 	if mask.value == nil {
-		return fmt.Sprintf("%073b", 0), nil
+		return fmt.Sprintf("%074b", 0), nil
 	}
-	return fmt.Sprintf("%073b", mask.value), nil
+	return fmt.Sprintf("%074b", mask.value), nil
 }
diff --git a/pkg/node/mock/api.go b/pkg/node/mock/api.go
diff --git a/test/data/block.yml b/test/data/block.yml
@@ -14,7 +14,7 @@
   last_results_hash: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
   evidence_hash: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
   proposer_address: 0x81A24EE534DEFE1557A4C7C437E8E8FBC2F834E8
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000101000100"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000101000100"
 - id: 1
   height: 999
   hash: 0x5F7A8DDFE6136FE76B65B9066D4F816D707F28C05B3362D66084664C5B39BA98
@@ -31,4 +31,4 @@
   last_results_hash: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
   evidence_hash: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
   proposer_address: 0x81A24EE534DEFE1557A4C7C437E8E8FBC2F834E8
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000000000000"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000000000000"
diff --git a/test/data/rollback/block.yml b/test/data/rollback/block.yml
@@ -14,7 +14,7 @@
   last_results_hash: 0x3330C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B333
   evidence_hash: 0x3330C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B333
   proposer_address: 0x33324EE534DEFE1557A4C7C437E8E8FBC2F83333
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000001000100"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000001000100"
 
 - id: 2
   height: 1000
@@ -32,7 +32,7 @@
   last_results_hash: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
   evidence_hash: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
   proposer_address: 0x81A24EE534DEFE1557A4C7C437E8E8FBC2F834E8
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000101000100"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000101000100"
 
 - id: 1
   height: 999
@@ -50,4 +50,4 @@
   last_results_hash: 0x1110C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B111
   evidence_hash: 0x1110C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B111
   proposer_address: 0x11124EE534DEFE1557A4C7C437E8E8FBC2F83111
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000000000000"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000000000000"
diff --git a/test/data/rollback/tx.yml b/test/data/rollback/tx.yml
@@ -12,7 +12,7 @@
   status: success
   codespace: sdk
   memo: memo
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000001000100"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000001000100"
 - id: 2
   hash: 0x652452A670011D629CC116E510BA88C1CABE061336661B1F3D206D248BD55811
   height: 1000
@@ -27,7 +27,7 @@
   status: success
   codespace:
   memo: memo2
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000100000000"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000100000000"
 - id: 3
   hash: 0xBA37478C3E9A804697271ACC474D484E9160899C86E551D737EEA819FCC75003
   height: 999
@@ -42,4 +42,4 @@
   status: success
   codespace:
   memo:
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000000100000"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000000100000"
diff --git a/test/data/tx.yml b/test/data/tx.yml
@@ -12,7 +12,7 @@
   status: success
   codespace: sdk
   memo: memo
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000001000100"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000001000100"
 
 - id: 2
   hash: 0x652452A670011D629CC116E510BA88C1CABE061336661B1F3D206D248BD55811
@@ -28,7 +28,7 @@
   status: success
   codespace:
   memo: memo2
-  message_types: "0000000000000000000000000000000000000000000000000000000000000100000000000"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000100000000000"
 
 - id: 3
   hash: 0xBA37478C3E9A804697271ACC474D484E9160899C86E551D737EEA819FCC75003
@@ -44,7 +44,7 @@
   status: success
   codespace:
   memo:
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000000100000"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000000100000"
 
 - id: 4
   hash: 
@@ -60,4 +60,4 @@
   status: success
   codespace:
   memo: [email protected]:26656
-  message_types: "0000000000000000000000000000000000000000000000000000000000000000000100000"
+  message_types: "00000000000000000000000000000000000000000000000000000000000000000000100000"