Merge branch 'main' into bunDev

.github/codeql/config.yml

@@ -0,0 +1,7 @@
+packs:
+  go:
+    - crypto-com/cosmos-sdk-codeql
+
+
+
+

.github/workflows/buildtest.yaml

@@ -72,6 +72,13 @@ jobs:
   test:
     runs-on: ubuntu-latest
     name: test quicksilver
+    strategy:
+      matrix:
+        arch: [amd64]
+        targetos: [linux, windows, darwin]
+        include:
+          - targetos: darwin
+            arch: arm64
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

.github/workflows/codeql.yml

@@ -2,15 +2,15 @@ name: "CodeQL"
 
 on:
   pull_request:
-    paths:
-      - "**.go"
+    branches:
+      - main
   push:
     branches:
       - main
       - develop
       - release/**
-    paths:
-      - "**.go"
+
+
 
 jobs:
   analyze:
@@ -33,7 +33,7 @@ jobs:
         with:
           languages: "go, javascript, typescript"
           queries: +security-and-quality,github/codeql/go/ql/src/experimental/InconsistentCode/DeferInLoop.ql@main,github/codeql/go/ql/src/experimental/Unsafe/WrongUsageOfUnsafe.ql@main,github/codeql/go/ql/src/experimental/CWE-369/DivideByZero.ql@main
-          packs: +crypto-com/cosmos-sdk-codeql
+          config-file: ./.github/codeql/config.yml
           # If you wish to specify custom queries, you can do so here or in a config file.
           # By default, queries listed here will override any specified in a config file.
           # Prefix the list here with "+" to use these queries and those in the config file.

.github/workflows/devskim.yml

@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: DevSkim
+
+on:
+  push:
+    branches: [ "main", "develop", "feat*", "main*", "unstable*" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '37 18 * * 2'
+
+jobs:
+  lint:
+    name: DevSkim
+    runs-on: ubuntu-20.04
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run DevSkim scanner
+        uses: microsoft/DevSkim-Action@v1
+
+      - name: Upload DevSkim scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: devskim-results.sarif

.gitignore

@@ -1,3 +1,5 @@
+##### Chain #######
+
 # OS
 .DS_Store
 *.swp
@@ -31,3 +33,42 @@ scripts/wallets.sh
 
 # Coverage
 coverage.txt
+
+
+##### web ui #######
+
+# dependencies
+web-ui/node_modules
+web-ui/.pnp
+web-ui/.pnp.js
+
+# testing
+web-ui/coverage
+
+# next.js
+web-ui/.next/
+web-ui//out/
+
+# production
+web-ui/build
+
+# misc
+web-ui/.DS_Store
+web-ui/*.pem
+
+# debug
+web-ui/npm-debug.log*
+web-ui/yarn-debug.log*
+web-ui/yarn-error.log*
+web-ui/.pnpm-debug.log*
+
+# local env files
+web-ui/.env*.local
+web-ui/.vscode
+
+# vercel
+web-ui/.vercel
+
+# typescript
+web-ui/*.tsbuildinfo
+web-ui/next-env.d.ts

cmd/quicksilverd/root.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"time"
 
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
@@ -138,10 +137,10 @@ func initTendermintConfig() *tmcfg.Config {
 	cfg.P2P.MaxNumInboundPeers = 200
 	cfg.P2P.MaxNumOutboundPeers = 40
 
-	// block times
-	cfg.Consensus.TimeoutCommit = 2 * time.Second                 // 2s blocks, think more on it later
-	cfg.Consensus.SkipTimeoutCommit = false                       // when we have 100% of signatures, block is done, don't wait for the TimeoutCommit
-	cfg.Consensus.PeerGossipSleepDuration = 25 * time.Millisecond // a p2p keepalive more or less
+	// block times (this comes in post-50)
+	//	cfg.Consensus.TimeoutCommit = 2 * time.Second                 // 2s blocks, think more on it later
+	//	cfg.Consensus.SkipTimeoutCommit = false                       // when we have 100% of signatures, block is done, don't wait for the TimeoutCommit
+	//	cfg.Consensus.PeerGossipSleepDuration = 25 * time.Millisecond // a p2p keepalive more or less
 
 	return cfg
 }

x/participationrewards/keeper/callbacks.go

@@ -49,7 +49,7 @@ func (k *Keeper) CallbackHandler() Callbacks {
 
 // Call calls callback handler.
 func (c Callbacks) Call(ctx sdk.Context, id string, args []byte, query icqtypes.Query) error {
-	if c.Has(id) {
+	if !c.Has(id) {
 		return fmt.Errorf("callback %s not found", id)
 	}
 	return c.callbacks[id](ctx, c.k, args, query)