Skip to content

Commit

Permalink
Merge branch 'feature/firehose-tracer-at-latest-release-tag' into rel…
Browse files Browse the repository at this point in the history
…ease/firehose

# Conflicts:
#	x/evm/tracers/firehose.go
  • Loading branch information
maoueh committed Sep 13, 2024
2 parents ea58032 + 08963c6 commit 1c8055f
Show file tree
Hide file tree
Showing 452 changed files with 16,455 additions and 53,183 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/dapp_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Run Dapp Tests

# Only runs when manually triggered
on:
workflow_dispatch:

jobs:
run-tests-devnet:
name: Run Tests on Devnet
runs-on: ubuntu-latest
environment:
name: devnet
env:
DAPP_TESTS_MNEMONIC: ${{ secrets.DAPP_TESTS_MNEMONIC }}
steps:
- uses: actions/checkout@v3

- name: Install seid
run: |
# Install seid using go install
make install
# Add the Go bin directory to the PATH
echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
echo "$HOME/go/bin" >> $GITHUB_PATH
- name: Run Dapp Tests Script on Devnet
run: |
./integration_test/dapp_tests/dapp_tests.sh devnet
run-tests-testnet:
name: Run Tests on Testnet
runs-on: ubuntu-latest
environment:
name: testnet
env:
DAPP_TESTS_MNEMONIC: ${{ secrets.DAPP_TESTS_MNEMONIC }}
steps:
- uses: actions/checkout@v3

- name: Install seid
run: |
# Install seid using go install
make install
# Add the Go bin directory to the PATH
echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
echo "$HOME/go/bin" >> $GITHUB_PATH
- name: Run Dapp Tests Script on Testnet
run: |
./integration_test/dapp_tests/dapp_tests.sh testnet
40 changes: 0 additions & 40 deletions .github/workflows/fuzz.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest
version: v1.60.1
args: --timeout 10m0s
7 changes: 7 additions & 0 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
DAPP_TESTS_MNEMONIC: ${{ secrets.DAPP_TESTS_MNEMONIC }}
strategy:
# other jobs should run even if one integration test fails
fail-fast: false
Expand Down Expand Up @@ -121,6 +122,12 @@ jobs:
"./integration_test/evm_module/scripts/evm_interoperability_tests.sh"
]
},
{
name: "dApp Tests",
scripts: [
"./integration_test/dapp_tests/dapp_tests.sh seilocal"
]
},
]
steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@ example/cosmwasm/cw721/target

# Solidity contracts artifacts
contracts/artifacts

# Integration tests build artifacts
integration_test/dapp_tests/artifacts
18 changes: 13 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,10 @@ run-local-node: kill-sei-node build-docker-node
docker run --rm \
--name sei-node \
--network host \
--user="$(shell id -u):$(shell id -g)" \
-v $(PROJECT_HOME):/sei-protocol/sei-chain:Z \
-v $(GO_PKG_PATH)/mod:/root/go/pkg/mod:Z \
-v $(shell go env GOCACHE):/root/.cache/go-build:Z \
--platform linux/x86_64 \
sei-chain/localnode
.PHONY: run-local-node
Expand All @@ -149,11 +151,13 @@ run-rpc-node: build-rpc-node
docker run --rm \
--name sei-rpc-node \
--network docker_localnet \
--user="$(shell id -u):$(shell id -g)" \
-v $(PROJECT_HOME):/sei-protocol/sei-chain:Z \
-v $(PROJECT_HOME)/../sei-tendermint:/sei-protocol/sei-tendermint:Z \
-v $(PROJECT_HOME)/../sei-cosmos:/sei-protocol/sei-cosmos:Z \
-v $(PROJECT_HOME)/../sei-db:/sei-protocol/sei-db:Z \
-v $(GO_PKG_PATH)/mod:/root/go/pkg/mod:Z \
-v $(shell go env GOCACHE):/root/.cache/go-build:Z \
-p 26668-26670:26656-26658 \
--platform linux/x86_64 \
sei-chain/rpcnode
Expand All @@ -163,39 +167,43 @@ run-rpc-node-skipbuild: build-rpc-node
docker run --rm \
--name sei-rpc-node \
--network docker_localnet \
--user="$(shell id -u):$(shell id -g)" \
-v $(PROJECT_HOME):/sei-protocol/sei-chain:Z \
-v $(PROJECT_HOME)/../sei-tendermint:/sei-protocol/sei-tendermint:Z \
-v $(PROJECT_HOME)/../sei-cosmos:/sei-protocol/sei-cosmos:Z \
-v $(PROJECT_HOME)/../sei-db:/sei-protocol/sei-db:Z \
-v $(GO_PKG_PATH)/mod:/root/go/pkg/mod:Z \
-v $(shell go env GOCACHE):/root/.cache/go-build:Z \
-p 26668-26670:26656-26658 \
--platform linux/x86_64 \
--env SKIP_BUILD=true \
sei-chain/rpcnode
.PHONY: run-rpc-node

kill-sei-node:
docker ps --filter name=sei-node --filter status=running -aq | xargs docker kill
docker ps --filter name=sei-node --filter status=running -aq | xargs docker kill 2> /dev/null || true

kill-rpc-node:
docker ps --filter name=sei-rpc-node --filter status=running -aq | xargs docker kill
docker ps --filter name=sei-rpc-node --filter status=running -aq | xargs docker kill 2> /dev/null || true

# Run a 4-node docker containers
docker-cluster-start: docker-cluster-stop build-docker-node
@rm -rf $(PROJECT_HOME)/build/generated
@cd docker && NUM_ACCOUNTS=10 INVARIANT_CHECK_INTERVAL=${INVARIANT_CHECK_INTERVAL} UPGRADE_VERSION_LIST=${UPGRADE_VERSION_LIST} docker-compose up
@mkdir -p $(shell go env GOPATH)/pkg/mod
@mkdir -p $(shell go env GOCACHE)
@cd docker && USERID=$(shell id -u) GROUPID=$(shell id -g) GOCACHE=$(shell go env GOCACHE) NUM_ACCOUNTS=10 INVARIANT_CHECK_INTERVAL=${INVARIANT_CHECK_INTERVAL} UPGRADE_VERSION_LIST=${UPGRADE_VERSION_LIST} docker compose up

.PHONY: localnet-start

# Use this to skip the seid build process
docker-cluster-start-skipbuild: docker-cluster-stop build-docker-node
@rm -rf $(PROJECT_HOME)/build/generated
@cd docker && NUM_ACCOUNTS=10 SKIP_BUILD=true docker-compose up
@cd docker && USERID=$(shell id -u) GROUPID=$(shell id -g) GOCACHE=$(shell go env GOCACHE) NUM_ACCOUNTS=10 SKIP_BUILD=true docker compose up
.PHONY: localnet-start

# Stop 4-node docker containers
docker-cluster-stop:
@cd docker && docker-compose down
@cd docker && USERID=$(shell id -u) GROUPID=$(shell id -g) GOCACHE=$(shell go env GOCACHE) docker compose down
.PHONY: localnet-stop


Expand Down
1 change: 0 additions & 1 deletion aclmapping/bank/mappings.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ var ErrorInvalidMsgType = fmt.Errorf("invalid message received for bank module")
func GetBankDepedencyGenerator() aclkeeper.DependencyGeneratorMap {
dependencyGeneratorMap := make(aclkeeper.DependencyGeneratorMap)

// dex place orders
placeOrdersKey := acltypes.GenerateMessageKey(&banktypes.MsgSend{})
dependencyGeneratorMap[placeOrdersKey] = MsgSendDependencyGenerator

Expand Down
2 changes: 0 additions & 2 deletions aclmapping/dependency_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package aclmapping
import (
aclkeeper "github.com/cosmos/cosmos-sdk/x/accesscontrol/keeper"
aclbankmapping "github.com/sei-protocol/sei-chain/aclmapping/bank"
acldexmapping "github.com/sei-protocol/sei-chain/aclmapping/dex"
aclevmmapping "github.com/sei-protocol/sei-chain/aclmapping/evm"
acloraclemapping "github.com/sei-protocol/sei-chain/aclmapping/oracle"
acltokenfactorymapping "github.com/sei-protocol/sei-chain/aclmapping/tokenfactory"
Expand All @@ -21,7 +20,6 @@ func (customDepGen CustomDependencyGenerator) GetCustomDependencyGenerators(evmK
dependencyGeneratorMap := make(aclkeeper.DependencyGeneratorMap)
wasmDependencyGenerators := aclwasmmapping.NewWasmDependencyGenerator()

dependencyGeneratorMap = dependencyGeneratorMap.Merge(acldexmapping.GetDexDependencyGenerators())
dependencyGeneratorMap = dependencyGeneratorMap.Merge(aclbankmapping.GetBankDepedencyGenerator())
dependencyGeneratorMap = dependencyGeneratorMap.Merge(acltokenfactorymapping.GetTokenFactoryDependencyGenerators())
dependencyGeneratorMap = dependencyGeneratorMap.Merge(wasmDependencyGenerators.GetWasmDependencyGenerators())
Expand Down
Loading

0 comments on commit 1c8055f

Please sign in to comment.