Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
Signed-off-by: Alien Coder <[email protected]>
  • Loading branch information
alienc0der authored Nov 2, 2024
2 parents 9a9018f + 3287c14 commit 2b92e57
Show file tree
Hide file tree
Showing 31 changed files with 220 additions and 106 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build
on:
workflow_dispatch:
merge_group:
pull_request:
push:
branches:
- main
- release/**

concurrency:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
if: steps.changed-files.outputs.any_changed == 'true'
- uses: actions/upload-artifact@v3
with:
name: "cronosd-tarball-${{ matrix.os }}"
name: "supernovad-tarball-${{ matrix.os }}"
path: "*.tar.gz"
if-no-files-found: ignore

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
name: "CodeQL"

on:
workflow_dispatch:
push:
branches:
- main
- release/**
paths:
- "**.go"
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/deployment_cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Delete Environment (default settings)

on:
workflow_dispatch:
delete:
branches-ignore:
- main

jobs:
delete:
runs-on: ubuntu-latest
steps:
- uses: strumwolf/delete-deployment-environment@v2
with:
# ⚠️ The provided token needs permission for admin write:org
token: ${{ secrets.supernova }}
environment: release
2 changes: 1 addition & 1 deletion .github/workflows/gosec.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Run Gosec
on:
workflow_dispatch:
pull_request:
push:
branches:
- main
- release/**

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linkchecker.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Check Markdown links
on:
workflow_dispatch:
schedule:
- cron: "* */24 * * *"
pull_request:
push:
branches:
- main
- release/**
jobs:
markdown-link-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Run Lint
# run on every pull request and push to main The `golangci` will pass without
# running if no *.{go, mod, sum} files have been changed.
on:
workflow_dispatch:
merge_group:
pull_request:
push:
branches:
- main
- release/**

concurrency:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Protobuf
# Protobuf runs buf (https://buf.build/) lint and check-breakage
# This workflow is only run when a .proto file has been changed
on:
workflow_dispatch:
pull_request:

concurrency:
Expand Down
45 changes: 23 additions & 22 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: release

on:
workflow_dispatch:
push:
tags:
- "v*.*.*"
Expand All @@ -19,10 +20,10 @@ jobs:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
with:
name: cronos
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
# - uses: cachix/cachix-action@v12
# with:
# name: cronos
# signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"

- name: build binaries
run: |
Expand Down Expand Up @@ -60,20 +61,20 @@ jobs:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: apple-actions/import-codesign-certs@v1
with:
p12-file-base64: ${{ secrets.MAC_CODE_SIGN_CERT }}
p12-password: ${{ secrets.MAC_CODE_SIGN_CERT_PASS }}
- uses: cachix/cachix-action@v12
with:
name: cronos
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
# - uses: apple-actions/import-codesign-certs@v1
# with:
# p12-file-base64: ${{ secrets.MAC_CODE_SIGN_CERT }}
# p12-password: ${{ secrets.MAC_CODE_SIGN_CERT_PASS }}
# - uses: cachix/cachix-action@v12
# with:
# name: cronos
# signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
- name: build binaries
env:
MAC_CODE_API_KEY: ${{ secrets.MAC_CODE_API_KEY }}
MAC_CODE_API_KEY_ID: ${{ secrets.MAC_CODE_API_KEY_ID }}
MAC_CODE_API_ISSUER_ID: ${{ secrets.MAC_CODE_API_ISSUER_ID }}
MAC_CODE_API_DEVELOPER_ID: ${{ secrets.MAC_CODE_API_DEVELOPER_ID }}
# env:
# MAC_CODE_API_KEY: ${{ secrets.MAC_CODE_API_KEY }}
# MAC_CODE_API_KEY_ID: ${{ secrets.MAC_CODE_API_KEY_ID }}
# MAC_CODE_API_ISSUER_ID: ${{ secrets.MAC_CODE_API_ISSUER_ID }}
# MAC_CODE_API_DEVELOPER_ID: ${{ secrets.MAC_CODE_API_DEVELOPER_ID }}
run: |
# install sha256sum
nix-env -i coreutils -f '<nixpkgs>'
Expand All @@ -82,11 +83,11 @@ jobs:
./scripts/release.sh
# codesign
for tarball in *.tar.gz;
do
./scripts/codesign_macos.sh $tarball
mv signed.tar.gz $tarball
done
# for tarball in *.tar.gz;
# do
# ./scripts/codesign_macos.sh $tarball
# mv signed.tar.gz $tarball
# done
# update checksum and upload
CHKFILE="checksums-darwin-$(uname -p).txt"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Semgrep
on:
workflow_dispatch:
# Scan changed files in PRs, block on new issues only (existing issues ignored)
pull_request: {}
push:
branches:
- main
- release/**
paths:
- .github/workflows/semgrep.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ name: Sims
# Sims workflow runs multiple types of simulations (nondeterminism, import-export, after-import, multi-seed-short)
# This workflow will run on main and release branches, if a .go, .mod or .sum file have been changed
on:
workflow_dispatch:
push:
paths-ignore:
- 'docs/**'
branches:
- main
- release/**
tags:
- "*"
pull_request:
types: auto_merge_enabled
types: [auto_merge_enabled]
issue_comment:
types: [created, edited]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: integration tests
on:
workflow_dispatch:
merge_group:
pull_request:
push:
branches:
- main
- release/**
tags:
- "*"
Expand Down
66 changes: 66 additions & 0 deletions .github/workflows/workflow_cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Delete old workflow runs
on:
workflow_dispatch:
inputs:
days:
description: 'Days-worth of runs to keep for each workflow'
required: true
default: '7'
minimum_runs:
description: 'Minimum runs to keep for each workflow'
required: true
default: '3'
delete_workflow_pattern:
description: 'Name or filename of the workflow (if not set, all workflows are targeted)'
required: false
delete_workflow_by_state_pattern:
description: 'Filter workflows by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
required: true
default: "ALL"
type: choice
options:
- "ALL"
- active
- deleted
- disabled_inactivity
- disabled_manually
delete_run_by_conclusion_pattern:
description: 'Remove runs based on conclusion: action_required, cancelled, failure, skipped, success'
required: true
default: "ALL"
type: choice
options:
- "ALL"
- "Unsuccessful: action_required,cancelled,failure,skipped"
- action_required
- cancelled
- failure
- skipped
- success
dry_run:
description: 'Logs simulated changes, no deletions are performed'
required: false

jobs:
del_runs:
runs-on: ubuntu-latest
permissions:
actions: write
contents: read
steps:
- name: Delete workflow runs
uses: Mattraks/delete-workflow-runs@v2
with:
token: ${{ github.token }}
repository: ${{ github.repository }}
retain_days: ${{ github.event.inputs.days }}
keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }}
delete_workflow_by_state_pattern: ${{ github.event.inputs.delete_workflow_by_state_pattern }}
delete_run_by_conclusion_pattern: >-
${{
startsWith(github.event.inputs.delete_run_by_conclusion_pattern, 'Unsuccessful:')
&& 'action_required,cancelled,failure,skipped'
|| github.event.inputs.delete_run_by_conclusion_pattern
}}
dry_run: ${{ github.event.inputs.dry_run }}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@
### Bug Fixes

* (rpc) [#1397](https://github.com/crypto-org-chain/cronos/pull/1397) Avoid panic on invalid elasticity_multiplier.
* (rpc) [#1466](https://github.com/crypto-org-chain/cronos/pull/1466) Fix handling of pending transactions related APIs.

### Features

* [#1406](https://github.com/crypto-org-chain/cronos/pull/1406) Add set-encryption-key for encryption module.
* [#1411](https://github.com/crypto-org-chain/cronos/pull/1411) Add encrypt and decrypt cmds for message.

### Features

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ comma := ,
build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))

# process linker flags
ldflags += -X github.com/cosmos/cosmos-sdk/version.Name=cronos \
-X github.com/cosmos/cosmos-sdk/version.AppName=cronosd \
ldflags += -X github.com/cosmos/cosmos-sdk/version.Name=supernova \
-X github.com/cosmos/cosmos-sdk/version.AppName=supernovad \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)
Expand All @@ -93,7 +93,7 @@ endif

all: build
build: check-network print-ledger go.sum
@go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR)/cronosd ./cmd/cronosd
@go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR)/supernovad ./cmd/cronosd

install: check-network print-ledger go.sum
@go install -mod=readonly $(BUILD_FLAGS) ./cmd/cronosd
Expand Down
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parent:


<div align="center">
<h1> <img src="./assets/cronos.svg" alt="Cronos Logo" width="300px" /> </h1>
<h1> <img src="https://zenon.org/images/contents/phases/getting-started/network-of-momentum.png" alt="Zenon" width="240px" /> </h1>
</div>
<br />

Expand Down Expand Up @@ -39,7 +39,7 @@ parent:

## 1. Description

**Cronos** is the Crypto.org EVM chain that aims to massively scale the DeFi ecosystem.
**Supernova** is the first Zenon EVM based extension-chain.

<a id="contributing" />

Expand Down Expand Up @@ -163,11 +163,6 @@ pystarport supervisorctl stop all

## 10. Useful links

- [Project Website](http://cronos.org/)
- [Technical Documentation](http://cronos.org/docs)
- Community chatrooms (non-technical): [Discord](https://discord.gg/nsp9JTC) [Telegram](https://t.me/CryptoComOfficial)
- Developer community channel (technical): [![Support Server](https://img.shields.io/discord/783264383978569728.svg?color=7289da&label=Cronos&logo=discord&style=flat-square)](https://discord.gg/pahqHz26q4)
- [Ethermint](https://github.com/evmos/ethermint) by Tharsis
- [Cosmos SDK documentation](https://docs.cosmos.network)
- [Cosmos Discord](https://discord.gg/W8trcGV)
- [Pystarport](https://github.com/crypto-com/pystarport/blob/main/README.md)
4 changes: 3 additions & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,9 @@ import (
_ "github.com/ethereum/go-ethereum/eth/tracers/native"
)

// EXTENSION-CHAIN
const (
Name = "cronos"
Name = "supernova"

// AddrLen is the allowed length (in bytes) for an address.
//
Expand Down Expand Up @@ -762,6 +763,7 @@ func New(
// Create static IBC router, add transfer route, then set and seal it
ibcRouter := porttypes.NewRouter()
// Add controller & ica auth modules to IBC router
// Add controller & ica auth modules to IBC router
ibcRouter.
AddRoute(icacontrollertypes.SubModuleName, icaControllerStack).
AddRoute(icahosttypes.SubModuleName, icaHostStack).
Expand Down
22 changes: 0 additions & 22 deletions assets/cronos.svg

This file was deleted.

3 changes: 2 additions & 1 deletion cmd/cronosd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ func NewRootCmd() *cobra.Command {
panic(err)
}

// EXTENSION-CHAIN
rootCmd := &cobra.Command{
Use: app.Name + "d",
Short: "Cronos Daemon",
Short: "Supernova Daemon",
PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
// set the default command outputs
cmd.SetOut(cmd.OutOrStdout())
Expand Down
Loading

0 comments on commit 2b92e57

Please sign in to comment.