Skip to content

Commit

Permalink
ok
Browse files Browse the repository at this point in the history
  • Loading branch information
aljo242 committed Jun 4, 2024
1 parent a2ce59b commit e87a87a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 23 deletions.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ COPY . /code/
# Download the correct version of libwasmvm for the given platform and verify checksum
RUN case "${TARGETPLATFORM}" in \
"linux/amd64") \
WASMVM_URL="https://github.com/CosmWasm/wasmvm/releases/download/v1.5.2/libwasmvm_muslc.x86_64.a" && \
WASMVM_CHECKSUM="e660a38efb2930b34ee6f6b0bb12730adccb040b6ab701b8f82f34453a426ae7" \
WASMVM_URL="https://github.com/CosmWasm/wasmvm/releases/download/v2.0.1/libwasmvm_muslc.x86_64.a" && \
WASMVM_CHECKSUM="85de2ab3c40236935dbd023c9211130d49c5464494c4b9b09ea33e27a2d6bf87" \
;; \
"linux/arm64") \
WASMVM_URL="https://github.com/CosmWasm/wasmvm/releases/download/v1.5.2/libwasmvm_muslc.aarch64.a" && \
Expand All @@ -30,8 +30,8 @@ RUN case "${TARGETPLATFORM}" in \
exit 1 \
;; \
esac && \
wget "${WASMVM_URL}" -O /lib/libwasmvm_muslc.a && \
echo "${WASMVM_CHECKSUM} /lib/libwasmvm_muslc.a" | sha256sum -c
wget "${WASMVM_URL}" -O /lib/libwasmvm_muslc.x86_64.a && \
echo "${WASMVM_CHECKSUM} /lib/libwasmvm_muslc.x86_64.a" | sha256sum -c

# force it to use static lib (from above) not standard libgo_cosmwasm.so file
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build
Expand All @@ -52,5 +52,4 @@ EXPOSE 26656
# tendermint rpc
EXPOSE 26657


CMD ["starsd", "start", "--pruning", "nothing", "--log_format", "json"]
11 changes: 4 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,13 @@ build-linux:
CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build $(BUILD_FLAGS) -o bin/starsd github.com/public-awesome/stargaze/cmd/starsd

build-docker-arm:
docker buildx build --platform linux/arm64 --load .
$(DOCKER) buildx build --platform linux/arm64 --load .

build-docker:
docker buildx build -t publicawesome/stargaze:local --platform linux/amd64 --load .
$(DOCKER) buildx build -t publicawesome/stargaze:local --platform linux/amd64 --load .

docker-test: build-linux
docker build -f docker/Dockerfile.test -t rocketprotocol/stargaze-relayer-test:latest .

build-docker-slinky:
docker build . -t stargaze:latest --platform linux/amd64
$(DOCKER) build -f docker/Dockerfile.test -t rocketprotocol/stargaze-relayer-test:latest .

test:
go test -v -race github.com/public-awesome/stargaze/v14/x/...
Expand All @@ -143,7 +140,7 @@ test-ica:
test-chain-conformance:
cd e2e && go test -v -race -run TestStargazeConformance .

test-slinky: build-docker-slinky
test-slinky:
@cd e2e/slinky && go test -v -race .

.PHONY: test test-e2e build-linux docker-test lint build install format
Expand Down
1 change: 0 additions & 1 deletion docker/entry-point.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,5 @@ sed -i "s/memory_cache_size = 512/memory_cache_size = $MEMORY_CACHE_SIZE/g" ~/.s
sed -i "s/enable = false/enable = true/g" ~/.starsd/config/app.toml
sed -i "s/localhost:9090/0.0.0.0:9090/g" ~/.starsd/config/app.toml


# Start the stake
starsd start --pruning=nothing
15 changes: 5 additions & 10 deletions e2e/slinky/slinky_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"
"testing"

sdkmath "cosmossdk.io/math"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module/testutil"
Expand Down Expand Up @@ -32,12 +31,9 @@ func init() {
}

var (
minGasPrice = sdkmath.LegacyMustNewDecFromStr("0.01")
gasPrice = minGasPrice

image = ibc.DockerImage{
Repository: "stargaze",
Version: "latest",
dockerImage = ibc.DockerImage{
Repository: "publicawesome/stargaze",
Version: "local-dev",
UidGid: "1025:1025",
}

Expand Down Expand Up @@ -76,12 +72,11 @@ var (
Name: "slinky",
NumValidators: &numValidators,
NumFullNodes: &numFullNodes,
Version: "latest",
NoHostMount: &noHostMount,
ChainConfig: ibc.ChainConfig{
EncodingConfig: &encodingConfig,
Images: []ibc.DockerImage{
image,
dockerImage,
},
Type: "cosmos",
Name: "slinky",
Expand All @@ -92,7 +87,7 @@ var (
CoinType: "118",
GasAdjustment: gasAdjustment,
GasPrices: fmt.Sprintf("0%s", denom),
TrustingPeriod: "48h",
TrustingPeriod: "112h",
NoHostMount: noHostMount,
ModifyGenesis: cosmos.ModifyGenesis(defaultGenesisKV),
SkipGenTx: false,
Expand Down

0 comments on commit e87a87a

Please sign in to comment.