Merge main

.github/workflows/test.yml

@@ -1,53 +1,71 @@
-#  Tests & Code Coverage workflow runs unit tests and uploads a code coverage report
-#  This workflow is run on pushes to master & every Pull Requests where a .go, .mod, .sum have been changed
-
 name: Tests & Code Coverage
 
 on:
   pull_request:
   push:
     branches:
-      - '**'	
+      - "**"
 
 jobs:
-
   should_run_test:
     runs-on: ubuntu-latest
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
-      - 
-        id: skip_check
+      - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
-          cancel_others: 'true'  # workflow-runs from outdated commits will be cancelled.
-          concurrent_skipping: 'same_content'
-          skip_after_successful_duplicate: 'true'
-          paths: '["**/*.go", "**/*.mod", "**/*.sum"]' 
+          cancel_others: "true" # workflow-runs from outdated commits will be cancelled.
+          concurrent_skipping: "same_content"
+          skip_after_successful_duplicate: "true"
+          paths: '["**/*.go", "**/*.mod", "**/*.sum"]'
           do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
-      - 
-        name: Skipping test
+      - name: Skipping test
         run: echo Should I skip tests? ${{ steps.skip_check.outputs.should_skip }}
-  
+
   test:
     needs: should_run_test
     if: ${{ needs.should_run_test.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Check out repository code
+      - name: Check out repository code
         uses: actions/checkout@v2
-      - 
-        name: Setup Golang
+      - name: Setup Golang
         uses: actions/setup-go@v2.1.4
         with:
           go-version: 1.17
-      - 
-        name: Display go version
+      - name: Display go version
         run: go version
-      - 
-        name: Run all tests
+      - name: Run all tests
         run: go test -mod=readonly -timeout 30m -coverprofile=coverage.txt -tags='norace' -covermode=atomic `go list ./... | grep -v simapp`
-      - 
-        name: Codecov
+      - name: Codecov
         uses: codecov/codecov-action@v1.5.2
+
+  liveness-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.17
+      - uses: technote-space/get-diff-action@v6.0.1
+        id: git_diff
+        with:
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+      - name: Install Starport
+        run: |
+          curl https://get.starport.network/starport@v0.19.5! | bash
+        if: env.GIT_DIFF
+      - name: Start Local Network via Starport
+        run: |
+          starport chain serve --reset-once -v -c ./starport.ci.yml > starport.out 2>&1 &
+        if: env.GIT_DIFF
+      - name: Test Local Network Liveness
+        run: |
+          sleep 3m
+          ./contrib/scripts/test_localnet_liveness.sh 100 5 50 localhost
+        if: env.GIT_DIFF

.mergify.yml

@@ -8,7 +8,7 @@ pull_request_rules:
     conditions:
       - "#approved-reviews-by>1"
       - base=main
-      - label=automerge
+      - label=A:automerge
     actions:
       queue:
         name: default
@@ -19,39 +19,39 @@ pull_request_rules:
   - name: backport patches to v3.x branch
     conditions:
       - base=main
-      - label=backport/v3.x
+      - label=A:backport/v3.x
     actions:
       backport:
         branches:
           - v3.x
   - name: backport patches to v4.x branch
     conditions:
       - base=main
-      - label=backport/v4.x
+      - label=A:backport/v4.x
     actions:
       backport:
         branches:
           - v4.x
   - name: backport patches to v5.x branch
     conditions:
       - base=main
-      - label=backport/v5.x
+      - label=A:backport/v5.x
     actions:
       backport:
         branches:
           - v5.x
   - name: backport patches to v6.x branch
     conditions:
       - base=main
-      - label=backport/v6.x
+      - label=A:backport/v6.x
     actions:
       backport:
         branches:
           - v6.x
   - name: backport patches to v7.x branch
     conditions:
       - base=main
-      - label=backport/v7.x
+      - label=A:backport/v7.x
     actions:
       backport:
         branches:

Makefile

@@ -7,7 +7,6 @@ LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
 DOCKER := $(shell which docker)
 BUILDDIR ?= $(CURDIR)/build
-TEST_DOCKER_REPO=osmosis-labs/osmosisdnode
 
 export GO111MODULE = on
 
@@ -243,37 +242,7 @@ format:
 ###                                Localnet                                 ###
 ###############################################################################
 
-build-docker-osmosisdnode:
-	$(MAKE) -C contrib/localtestnet
-
-# Run a 4-node testnet locally
-localnet-start: build-linux build-docker-osmosisdnode # localnet-stop
-	@if ! [ -f $(BUILDDIR)/node0/osmosisd/config/genesis.json ]; \
-	then docker run --rm -v $(BUILDDIR):/osmosisd:Z osmosis-labs/osmosisdnode testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; \
-	fi
-	docker-compose up -d
-
-# Stop testnet
-localnet-stop:
-	docker-compose down
-
-clean-localnet: localnet-stop
-	rm -rf $(BUILDDIR)/node* $(BUILDDIR)/gentxs
-
-test-docker:
-	@docker build -f contrib/Dockerfile.test -t ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD) .
-	@docker tag ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD) ${TEST_DOCKER_REPO}:$(shell git rev-parse --abbrev-ref HEAD | sed 's#/#_#g')
-	@docker tag ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD) ${TEST_DOCKER_REPO}:latest
-
-test-docker-push: test-docker
-	@docker push ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD)
-	@docker push ${TEST_DOCKER_REPO}:$(shell git rev-parse --abbrev-ref HEAD | sed 's#/#_#g')
-	@docker push ${TEST_DOCKER_REPO}:latest
 
 .PHONY: all build-linux install format lint \
-	go-mod-cache draw-deps clean build \
-	setup-transactions setup-contract-tests-data start-osmosis run-lcd-contract-tests contract-tests \
-	test test-all test-build test-cover test-unit test-race \
-	benchmark \
-	build-docker-osmosisdnode localnet-start localnet-stop \
-	docker-single-node
+	go-mod-cache draw-deps clean build build-contract-tests-hooks \
+	test test-all test-build test-cover test-unit test-race benchmark

app/apptesting/gamm.go

@@ -0,0 +1,47 @@
+package apptesting
+
+import (
+	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
+	"github.com/cosmos/cosmos-sdk/simapp"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer"
+)
+
+var gammPoolMakerAcc = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address().Bytes())
+
+// Returns a Univ2 pool with the initial liquidity being the provided balances
+func (suite *KeeperTestHelper) PrepareUni2PoolWithAssets(asset1, asset2 sdk.Coin) uint64 {
+	return suite.preparePool(
+		[]balancer.PoolAsset{
+			{
+				Weight: sdk.NewInt(1),
+				Token:  asset1,
+			},
+			{
+				Weight: sdk.NewInt(1),
+				Token:  asset2,
+			},
+		},
+	)
+}
+
+func (suite *KeeperTestHelper) preparePool(assets []balancer.PoolAsset) uint64 {
+	suite.Require().Len(assets, 2)
+
+	// Add coins for pool creation fee + coins needed to mint balances
+	fundCoins := sdk.Coins{sdk.NewCoin("uosmo", sdk.NewInt(10000000000))}
+	for _, a := range assets {
+		fundCoins = fundCoins.Add(a.Token)
+	}
+	err := simapp.FundAccount(suite.App.BankKeeper, suite.Ctx, gammPoolMakerAcc, fundCoins)
+	suite.Require().NoError(err)
+
+	msg := balancer.NewMsgCreateBalancerPool(gammPoolMakerAcc, balancer.PoolParams{
+		SwapFee: sdk.ZeroDec(),
+		ExitFee: sdk.ZeroDec(),
+	}, assets, "")
+	poolId, err := suite.App.GAMMKeeper.CreatePool(suite.Ctx, msg)
+	suite.NoError(err)
+	return poolId
+}

app/apptesting/test_suite.go

@@ -171,11 +171,12 @@ func (keeperTestHelper *KeeperTestHelper) SetupGammPoolsWithBondDenomMultiplier(
 			}
 			poolAssets []balancer.PoolAsset = []balancer.PoolAsset{defaultFooAsset, defaultBarAsset}
 		)
-
-		poolId, err := keeperTestHelper.App.GAMMKeeper.CreateBalancerPool(keeperTestHelper.Ctx, acc1, balancer.PoolParams{
+		poolParams := balancer.PoolParams{
 			SwapFee: sdk.NewDecWithPrec(1, 2),
 			ExitFee: sdk.NewDecWithPrec(1, 2),
-		}, poolAssets, defaultFutureGovernor)
+		}
+		msg := balancer.NewMsgCreateBalancerPool(acc1, poolParams, poolAssets, defaultFutureGovernor)
+		poolId, err := keeperTestHelper.App.GAMMKeeper.CreatePool(keeperTestHelper.Ctx, msg)
 		keeperTestHelper.Require().NoError(err)
 
 		pool, err := keeperTestHelper.App.GAMMKeeper.GetPool(keeperTestHelper.Ctx, poolId)

cmd/osmosisd/cmd/balances_from_state_export.go

@@ -60,7 +60,7 @@ func underlyingCoins(originCoins sdk.Coins, pools map[string]gammtypes.PoolI) sd
 	for _, coin := range originCoins {
 		if pools[coin.Denom] != nil {
 			pool := pools[coin.Denom]
-			assets := pool.GetTotalLpBalances(sdk.Context{})
+			assets := pool.GetTotalPoolLiquidity(sdk.Context{})
 			for _, asset := range assets {
 				balances = balances.Add(sdk.NewCoin(asset.Denom, asset.Amount.Mul(coin.Amount).Quo(pool.GetTotalShares())))
 				if pools[asset.Denom] != nil { // this happens when there's a pool for LP token swap