Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,49 +48,6 @@ jobs:
path: "*.tar.gz"
if-no-files-found: ignore

unittest:
runs-on: ubuntu-latest
timeout-minutes: 40
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- id: changed-files
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
with:
files: |
**/*.go
*.mod
*.sum
- uses: cachix/cachix-action@6a9a34cdd93d0ae4b4b59fd678660efb08109f2f # v12
if: steps.changed-files.outputs.any_changed == 'true'
with:
name: cronos
# github don't pass secrets for pull request from fork repos,
# in that case the push is disabled naturally.
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
- name: test & coverage report creation
run: |
nix develop .#rocksdb -c make test test-versiondb
if: steps.changed-files.outputs.any_changed == 'true'
- name: filter out proto files
run: |
excludelist+=" $(find ./ -type f -name '*.pb.go')"
for filename in ${excludelist}; do
filename=$(echo $filename | sed 's/^./github.com\/crypto-org-chain\/cronos/g')
echo "Excluding ${filename} from coverage report..."
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
if: steps.changed-files.outputs.any_changed == 'true'
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage.txt,./memiavl/coverage.txt,./store/coverage.txt,./versiondb/coverage.txt
if: steps.changed-files.outputs.any_changed == 'true'

gomod2nix:
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ jobs:
BUILD_TAGS=rocksdb,grocksdb_clean_link,objstore
go build -tags $BUILD_TAGS ./cmd/cronosd
golangci-lint run --fix --output.text.path stdout --path-prefix=./ --timeout 30m --build-tags $BUILD_TAGS
cd versiondb
golangci-lint run --fix --output.text.path stdout --path-prefix=./versiondb --timeout 30m --build-tags $BUILD_TAGS
cd ../memiavl
golangci-lint run --fix --output.text.path stdout --path-prefix=./memiavl --timeout 30m --build-tags objstore
cd ../store
golangci-lint run --fix --output.text.path stdout --path-prefix=./store --timeout 30m --build-tags objstore
# Check only if there are differences in the source code
if: steps.changed-files.outputs.any_changed == 'true'
- name: check working directory is clean
Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/proto.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changelog

## UNRELEASED

* [#1895](https://github.com/crypto-org-chain/cronos/pull/1895) feat: use cronos store.
* [#1869](https://github.com/crypto-org-chain/cronos/pull/1869) Add missing tx context during vm initialisation
* [#1872](https://github.com/crypto-org-chain/cronos/pull/1872) Support 4byteTracer for tracer
* [#1875](https://github.com/crypto-org-chain/cronos/pull/1875) Support for preinstalls
Expand Down
5 changes: 3 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import (
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
memiavlstore "github.com/crypto-org-chain/cronos-store/store"
"github.com/crypto-org-chain/cronos/client/docs"
memiavlstore "github.com/crypto-org-chain/cronos/store"
"github.com/crypto-org-chain/cronos/x/cronos"
cronosclient "github.com/crypto-org-chain/cronos/x/cronos/client"
cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
Expand Down Expand Up @@ -416,7 +416,8 @@ func New(
// only enable memiavl cache if block-stm is not enabled, because it's not concurrency-safe.
cacheSize = cast.ToInt(appOpts.Get(memiavlstore.FlagCacheSize))
}
baseAppOptions = memiavlstore.SetupMemIAVL(logger, homePath, appOpts, false, false, cacheSize, baseAppOptions)
chainId := cast.ToString(appOpts.Get(flags.FlagChainID))
baseAppOptions = memiavlstore.SetupMemIAVL(logger, homePath, appOpts, false, false, cacheSize, chainId, baseAppOptions)

// enable optimistic execution
baseAppOptions = append(baseAppOptions, baseapp.SetOptimisticExecution())
Expand Down
2 changes: 1 addition & 1 deletion app/bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
tmtypes "github.com/cometbft/cometbft/types"
dbm "github.com/cosmos/cosmos-db"
memiavlstore "github.com/crypto-org-chain/cronos/store"
memiavlstore "github.com/crypto-org-chain/cronos-store/store"
"github.com/crypto-org-chain/cronos/x/cronos/types"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
Expand Down
4 changes: 2 additions & 2 deletions app/versiondb.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"path/filepath"

"github.com/crypto-org-chain/cronos/versiondb"
"github.com/crypto-org-chain/cronos/versiondb/tsrocksdb"
"github.com/crypto-org-chain/cronos-store/versiondb"
"github.com/crypto-org-chain/cronos-store/versiondb/tsrocksdb"

storetypes "cosmossdk.io/store/types"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cronosd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
cmtcli "github.com/cometbft/cometbft/libs/cli"
dbm "github.com/cosmos/cosmos-db"
rosettaCmd "github.com/cosmos/rosetta/cmd"
memiavlcfg "github.com/crypto-org-chain/cronos-store/store/config"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/opendb"
memiavlcfg "github.com/crypto-org-chain/cronos/store/config"
"github.com/crypto-org-chain/cronos/x/cronos"
e2eecli "github.com/crypto-org-chain/cronos/x/e2ee/client/cli"
ethermintclient "github.com/evmos/ethermint/client"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cronosd/cmd/versiondb.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package cmd
import (
"sort"

versiondbclient "github.com/crypto-org-chain/cronos-store/versiondb/client"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/opendb"
versiondbclient "github.com/crypto-org-chain/cronos/versiondb/client"
"github.com/linxGnu/grocksdb"
"github.com/spf13/cobra"
)
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ require (
// release/v10.0.x
github.com/cosmos/ibc-go/v10 v10.1.1
github.com/cosmos/rosetta v0.50.12
github.com/crypto-org-chain/cronos/store v0.0.4
github.com/crypto-org-chain/cronos/versiondb v0.0.0-00010101000000-000000000000
github.com/crypto-org-chain/cronos-store/store v0.0.0-20251119030934-19a930cec475
github.com/crypto-org-chain/cronos-store/versiondb v0.0.0-20251119030934-19a930cec475
github.com/ethereum/go-ethereum v1.15.5
github.com/evmos/ethermint v0.0.0-00010101000000-000000000000
github.com/golang/protobuf v1.5.4
Expand Down Expand Up @@ -109,7 +109,7 @@ require (
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
github.com/creachadair/atomicfile v0.3.1 // indirect
github.com/creachadair/tomledit v0.0.24 // indirect
github.com/crypto-org-chain/cronos/memiavl v0.0.4 // indirect
github.com/crypto-org-chain/cronos-store/memiavl v0.0.4 // indirect
github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6 // indirect
github.com/danieljoos/wincred v1.2.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand Down Expand Up @@ -285,9 +285,9 @@ replace (
)

replace (
github.com/crypto-org-chain/cronos/memiavl => ./memiavl
github.com/crypto-org-chain/cronos/store => ./store
github.com/crypto-org-chain/cronos/versiondb => ./versiondb
github.com/crypto-org-chain/cronos-store/memiavl => github.com/crypto-org-chain/cronos-store/memiavl v0.0.0-20251119030934-19a930cec475
github.com/crypto-org-chain/cronos-store/store => github.com/crypto-org-chain/cronos-store/store v0.0.0-20251119030934-19a930cec475
github.com/crypto-org-chain/cronos-store/versiondb => github.com/crypto-org-chain/cronos-store/versiondb v0.0.0-20251119030934-19a930cec475
)

replace (
Expand Down
6 changes: 6 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,12 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254
github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254 h1:JzLOFRiKsDtLJt5h0M0jkEIPDKvFFyja7VEp7gG6O9U=
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
github.com/crypto-org-chain/cronos-store/memiavl v0.0.0-20251119030934-19a930cec475 h1:2PH9b+gq5HNLooDvzYf2arnViUrPA27Pl7l8GOkoQek=
github.com/crypto-org-chain/cronos-store/memiavl v0.0.0-20251119030934-19a930cec475/go.mod h1:KnOEIG6mIPdwXbBrGIfs7pAI6HoeXxUZG7uiKUGzvf4=
github.com/crypto-org-chain/cronos-store/store v0.0.0-20251119030934-19a930cec475 h1:RyRwmzq6DIAJllFnqch0cGMWXEJccPPZSKjU1LJNJNw=
github.com/crypto-org-chain/cronos-store/store v0.0.0-20251119030934-19a930cec475/go.mod h1:azkyg9ktCJC3oYHONOE+utuPcdDOjwL8HD0RoBK90iU=
github.com/crypto-org-chain/cronos-store/versiondb v0.0.0-20251119030934-19a930cec475 h1:vfBfdlD9A9ieRf1drYHacprKb4cVQUNp/2CdMUl8ecI=
github.com/crypto-org-chain/cronos-store/versiondb v0.0.0-20251119030934-19a930cec475/go.mod h1:1Af+ohAt+c1FSHAw27eq3D2ne2o/j7psXyi2/2Bfd4g=
github.com/crypto-org-chain/ethermint v0.22.1-0.20251007011737-164da0caf703 h1:O0DF++IbEl5TAknuXtAcxFTocZ8zO8DlZRUMIo9HnLA=
github.com/crypto-org-chain/ethermint v0.22.1-0.20251007011737-164da0caf703/go.mod h1:GVopiVE4ftDRfAm3e6qj7URhNTa3Tv3JrCbfO/s8P/I=
github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6 h1:6KPEi8dWkDSBddQb4NAvEXmNnTXymF3yVeTaT4Hz1iU=
Expand Down
12 changes: 12 additions & 0 deletions gomod2nix.toml
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,18 @@ schema = 3
[mod."github.com/creachadair/tomledit"]
version = "v0.0.24"
hash = "sha256-4vUukHONOjNn0qfQr4esK6TWfPWsIp+rbdz65og84lw="
[mod."github.com/crypto-org-chain/cronos-store/memiavl"]
version = "v0.0.0-20251119030934-19a930cec475"
hash = "sha256-QxkblWiy9aiwRaahmZ3n2If/ZZGTMw4LbZNIreM5wfI="
replaced = "github.com/crypto-org-chain/cronos-store/memiavl"
[mod."github.com/crypto-org-chain/cronos-store/store"]
version = "v0.0.0-20251119030934-19a930cec475"
hash = "sha256-xSKdtAarmR4rntIy0AlQ/VkuUdBL9oxVBteG7amW450="
replaced = "github.com/crypto-org-chain/cronos-store/store"
[mod."github.com/crypto-org-chain/cronos-store/versiondb"]
version = "v0.0.0-20251119030934-19a930cec475"
hash = "sha256-iJ+PMkKXBwbwR3B/aV4Ywn15m6vhwYJmze4Q/qAOFTI="
replaced = "github.com/crypto-org-chain/cronos-store/versiondb"
[mod."github.com/crypto-org-chain/go-block-stm"]
version = "v0.0.0-20241213061541-7afe924fb4a6"
hash = "sha256-bl5jVL5oouu9/kbuJv9ua4w4hRhchnWQ8ogIEnW9NLs="
Expand Down
129 changes: 0 additions & 129 deletions memiavl/README.md

This file was deleted.

Loading
Loading