Skip to content
This repository has been archived by the owner on Jun 9, 2024. It is now read-only.

feat(rollkit): Tracking diff [DO NOT MERGE] #1291

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b16498b
feat: upgrade Rollkit x Polaris "rollkit" branch (#1083)
jcstein Sep 7, 2023
43f11ce
chore: remove unused init.sh script
jcstein Sep 12, 2023
602ecc9
chore: upgrade rollkit/cosmos-sdk in cosmos/go.mod
jcstein Oct 2, 2023
0cebf87
feat: upgrade Rollkit x Polaris "rollkit" branch (#1083)
jcstein Sep 7, 2023
2a9e87a
chore: remove unused init.sh script
jcstein Sep 12, 2023
1283c84
chore: upgrade rollkit/cosmos-sdk in cosmos/go.mod
jcstein Oct 2, 2023
af6c2a1
upgrade to rollkit/cosmos-sdk latest release with upstream changes
Oct 26, 2023
f166913
Merge remote-tracking branch 'upstream/rollkit' into rollkit
Oct 26, 2023
062859a
Merge remote-tracking branch 'origin/main' into rollkit
Nov 3, 2023
816f483
fix: set auth token and da block height
jcstein Nov 6, 2023
7dd800f
Merge remote-tracking branch 'upstream/main' into HEAD
Nov 6, 2023
64b98cd
Merge branch 'main' into rollkit-main
itsdevbear Nov 6, 2023
56afb63
upgrade to rollkit v0.11.2 which fixes the evm block failed to proces…
Nov 14, 2023
ccd796a
chore(license): add `rollkit` license. (#1316)
itsdevbear Nov 17, 2023
ac7cc80
fix(e2e): pin polaris & rollkit versions to testapp (#1320)
technicallyty Nov 20, 2023
819af20
chore: pull main and upgrade rollkit to v0.11.5 (centralized sequence…
gupadhyaya Nov 27, 2023
7187583
chore: fix rollkit validator error (#1335)
gupadhyaya Nov 28, 2023
f1ebeda
feat: add centralized seq for rollkit
jcstein Nov 29, 2023
bc83aa6
Revert "feat: add centralized seq for rollkit"
jcstein Nov 29, 2023
91c8d0e
update to rollkit v0.11.9 and corresponding rollkit/cosmos-sdk (#1403)
gupadhyaya Jan 10, 2024
cd5f8ef
upgrade to latest rollkit v0.11.19 (#1413)
gupadhyaya Jan 12, 2024
83a2747
feat: Rollkit updated main (#1482)
gupadhyaya Feb 6, 2024
820dd2b
feat: Update entrypoint.sh to change block time from 1s to 2s (#1484)
jcstein Feb 7, 2024
941a580
update rollkit/cosmos-sdk
Feb 7, 2024
7b19093
fix(miner): use unixnano for block time
Feb 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# fail-fast: false
# matrix:
# language: ["go"]
# versions: [1.21.3]
# versions: [1.21.6]
# # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# # Use only 'java' to analyze code written in Java, Kotlin or both
# # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
docs:
strategy:
matrix:
go-version: [1.21.3]
go-version: [1.21.6]
python-version: [3.11.5]
runs-on: ubuntu-latest
steps:
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@

name: e2e

concurrency:
group: ci-${{ github.ref }}-e2e
cancel-in-progress: true

on:
pull_request:
push:
Expand All @@ -32,7 +36,7 @@ jobs:
matrix:
docker-type: [base] # Changed docker-version to docker-type for consistency with the Makefile
os: [polaris-linux-latest]
go-version: [1.21.3]
go-version: [1.21.6]
arch: [amd64] # Changed go-arch to arch for consistency with the Makefile
image-name: ["polard/base:v0.0.0"]
export-name: [base-image]
Expand Down Expand Up @@ -72,7 +76,7 @@ jobs:
namespace: [cosmos]
docker-type: [localnet] # Changed docker-version to docker-type for consistency with the Makefile
os: [polaris-linux-latest]
go-version: [1.21.3]
go-version: [1.21.6]
arch: [amd64] # Changed go-arch to arch for consistency with the Makefile
base-image: [base-image]
image-name: ["polard/localnet:v0.0.0"]
Expand Down Expand Up @@ -119,7 +123,7 @@ jobs:
strategy:
matrix:
os: [polaris-linux-latest]
go-version: [1.21.3]
go-version: [1.21.6]
base-image: [base-image]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -149,7 +153,7 @@ jobs:
matrix:
namespace: ["e2e", "localnet"]
os: [polaris-linux-latest]
go-version: [1.21.3]
go-version: [1.21.6]
base-image: [localnet]
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
- main

concurrency:
group: ci-${{ github.ref }}-tests
group: ci-${{ github.ref }}-pipeline
cancel-in-progress: true

jobs:
Expand All @@ -36,7 +36,7 @@ jobs:
matrix:
args: ["build", "lint", "test-unit-race", "test-unit-cover"]
os: [polaris-linux-latest]
go-version: [1.21.3]
go-version: [1.21.6]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,27 @@ node_modules
.next
next-env.d.ts
.env
.envrc
out

# docker test
**/temp/

node_modules
.env
coverage
coverage.json
typechain
typechain-types

#Hardhat files
cache
artifacts

# hardhat
**/cache/

# integration testing coverage
coverage-test-unit-cover.txt

.direnv/
4 changes: 2 additions & 2 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ linters-settings:
- Prefix(cosmossdk.io)
- Prefix(github.com/cosmos/cosmos-sdk
- Prefix(github.com/ethereum/go-ethereum
- Prefix(pkg.berachain.dev
- Prefix(pkg.berachain.dev/polaris
- Prefix(github.com/berachain
- Prefix(github.com/berachain/polaris
- blank
- dot
skip-generated: true
Expand Down
8 changes: 8 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,11 @@ pull_request_rules:
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
- name: backport patches to v0.0.2-alpha branch
conditions:
- base=main
- label=backport/v0.0.2-alpha
actions:
backport:
branches:
- release/v0.0.2-alpha
6 changes: 3 additions & 3 deletions .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ mockname: "{{.InterfaceNameCamel}}"
filename: "{{.InterfaceNameSnake}}.go"
outpkg: "mocks"
packages:
pkg.berachain.dev/polaris/cosmos/config:
github.com/berachain/polaris/cosmos/config:
config:
recursive: True
with-expecter: true
all: True
pkg.berachain.dev/polaris/cosmos/runtime/txpool:
github.com/berachain/polaris/cosmos/runtime/txpool:
config:
recursive: True
with-expecter: true
all: True
pkg.berachain.dev/polaris/eth/core/state:
github.com/berachain/polaris/eth/core/state:
config:
recursive: True
with-expecter: true
Expand Down
15 changes: 5 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<h1 align="center"> Polaris Monorepo ❄️🔭 </h1>

![](./docs/web/public/bear_banner.png)

*The project is still work in progress, see the [disclaimer below](#-warning-under-construction-).*

<div>
<a href="https://codecov.io/gh/berachain/polaris" target="_blank">
<img src="https://codecov.io/gh/berachain/polaris/branch/main/graph/badge.svg?token=5SYYGUS8GW"/>
<img src="https://codecov.io/gh/berachain/polaris/branch/main/graph/badge.svg?token=5SYYGUS8GW"/>
</a>
<a href="https://pkg.go.dev/pkg.berachain.dev/polaris" target="_blank">
<img src="https://pkg.go.dev/badge/pkg.berachain.dev/polaris.svg" alt="Go Reference">
<a href="https://pkg.go.dev/github.com/berachain/polaris" target="_blank">
<img src="https://pkg.go.dev/badge/github.com/berachain/polaris.svg" alt="Go Reference">
</a>
<a href="https://t.me/polaris_devs" target="_blank">
<img alt="Telegram Chat" src="https://img.shields.io/endpoint?color=neon&logo=telegram&label=chat&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fpolaris_devs">
Expand All @@ -21,8 +19,6 @@
</a>
</div>



## What is Polaris?

Introducing Polaris, the revolutionary framework designed to simplify the integration of an Ethereum Virtual Machine (EVM) into your application. Polaris is built with a clean, easy-to-integrate API that eliminates the need for developers to spend time hacking together their own EVM integration solutions. Our framework is highly modular, allowing you to choose the components that best fit your needs and integrate an EVM environment into virtually any application.
Expand All @@ -46,16 +42,15 @@ If you want to help contribute to the framework, check out the [Framework Specs]

<pre>
🔭 Polaris 🔭
├── <a href="./build">build</a>: Build scripts and developer tooling.
├── <a href="./contracts">contracts</a>: Contracts and bindings for Polaris (and hosts).
├── <a href="./docs">docs</a>: Documentation for Polaris.
├── <a href="./cosmos">cosmos</a>: Polaris integrated into a Cosmos-SDK based chain.
├── <a href="./e2e">e2e</a>: End-to-end testing utilities.
├── <a href="./eth">eth</a>: The Core of the Polaris Ethereum Framework.
├── <a href="./lib">lib</a>: A collection of libraries used throughout the repo.
├── <a href="./tools">tools</a>: Package for holding tooling deps.
├── <a href="./proto">proto</a>: Protobuf definitions.
</pre>


## Build & Test

[Golang 1.20+](https://go.dev/doc/install) and [Foundry](https://book.getfoundry.sh/getting-started/installation) are required for Polaris.
Expand Down
6 changes: 3 additions & 3 deletions build/scripts/cosmos.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ TESTAPP_DIR = ./e2e/testapp
PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)

# process build tags
build_tags = netgo
build_tags = netgo pebbledb
ifeq ($(LEDGER_ENABLED),true)
ifeq ($(OS),Windows_NT)
GCCEXE = $(shell where gcc.exe 2> NUL)
Expand Down Expand Up @@ -69,8 +69,8 @@ comma := ,
build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))

# process linker flags
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \
-X github.com/cosmos/cosmos-sdk/version.AppName=simd \
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=polard \
-X github.com/cosmos/cosmos-sdk/version.AppName=polard \
-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 Down
8 changes: 5 additions & 3 deletions build/scripts/main.mk
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ proto-build:
# Variables
DOCKER_TYPE ?= base
ARCH ?= arm64
GO_VERSION ?= 1.21.3
GO_VERSION ?= 1.21.6
IMAGE_NAME ?= polard
IMAGE_VERSION ?= v0.0.0
BASE_IMAGE ?= polard/base:$(IMAGE_VERSION)
Expand Down Expand Up @@ -289,7 +289,7 @@ format:
@$(MAKE) license-fix buf-lint-fix forge-lint-fix golangci-fix

lint:
@$(MAKE) license buf-lint forge-lint golangci gosec
@$(MAKE) license forge-lint golangci gosec


#################
Expand Down Expand Up @@ -370,7 +370,9 @@ protoDir := "proto"

buf-install:
@echo "--> Installing buf"
@go install github.com/bufbuild/buf/cmd/buf
@if [ "$(shell uname)" = "Darwin" ]; then \
brew install bufbuild/buf/buf; \
fi

buf-lint-fix:
@$(MAKE) buf-install
Expand Down
4 changes: 2 additions & 2 deletions build/scripts/proto_generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ for dir in $proto_dirs; do
done

# move proto files to the right places
cp -r pkg.berachain.dev/polaris/* ../
rm -rf pkg.berachain.dev
cp -r github.com/berachain/polaris/* ../
rm -rf github.com/berachain

cd ../

Expand Down
Loading
Loading