feat: adding basic tally structure

.gitignore

@@ -19,4 +19,4 @@ seda.env
 .env
 
 # coverage files
-coverage.txt
+coverage.txt

app/app.go

@@ -612,9 +612,12 @@ func NewApp(
 		appCodec,
 		runtime.NewKVStoreService(keys[wasmstoragetypes.StoreKey]),
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		app.AccountKeeper,
+		app.BankKeeper,
 		contractKeeper,
+		app.WasmKeeper,
 	)
-	wasmStorageModule := wasmstorage.NewAppModule(appCodec, app.WasmStorageKeeper, app.AccountKeeper, app.BankKeeper)
+	wasmStorageModule := wasmstorage.NewAppModule(appCodec, app.WasmStorageKeeper)
 
 	/* =================================================== */
 	/*                  TRANSFER STACK                     */

dockerfiles/Dockerfile.e2e

@@ -1,5 +1,3 @@
-# syntax=docker/dockerfile:1
-
 ARG GO_VERSION="1.21"
 ARG RUNNER_IMAGE="alpine:3.17"
 ARG SEDA_EXPONENT="18"
@@ -18,7 +16,8 @@ RUN apk add --no-cache \
     ca-certificates \
     build-base \
     linux-headers \
-    git
+    git \
+    binutils-gold
 
 # Download go dependencies
 WORKDIR /seda-chain

go.mod

@@ -20,6 +20,7 @@ require (
 	cosmossdk.io/x/tx v0.13.2
 	cosmossdk.io/x/upgrade v0.1.1
 	github.com/CosmWasm/wasmd v0.50.0
+	github.com/CosmWasm/wasmvm v1.5.0
 	github.com/aws/aws-sdk-go v1.44.224
 	github.com/cometbft/cometbft v0.38.6
 	github.com/cosmos/cosmos-db v1.0.2
@@ -41,12 +42,14 @@ require (
 	github.com/hashicorp/go-plugin v1.6.0
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/pkg/errors v0.9.1
+	github.com/sedaprotocol/seda-wasm-vm/tallyvm v0.0.0-20240617203732-2649db4864d8
 	github.com/sedaprotocol/vrf-go v0.0.0-20231211075603-e5a17bb0b87c
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2
 	github.com/stretchr/testify v1.9.0
+	go.uber.org/mock v0.4.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c
 	google.golang.org/grpc v1.63.2
 	google.golang.org/protobuf v1.33.0
@@ -64,7 +67,6 @@ require (
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/CosmWasm/wasmvm v1.5.0 // indirect
 	github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
 	github.com/DataDog/zstd v1.5.5 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect

go.sum

@@ -1009,6 +1009,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/sedaprotocol/rosetta-seda v0.0.0-20240427181737-e1d7563b2529 h1:VbJcd022MkoohRyAfktHnN99Brt/4eJr01mdLqPhGaE=
 github.com/sedaprotocol/rosetta-seda v0.0.0-20240427181737-e1d7563b2529/go.mod h1:GdlDqGJN2g55PHiwYJs2bQMlL0rdlQQbauK4dcrOI6w=
+github.com/sedaprotocol/seda-wasm-vm/tallyvm v0.0.0-20240617203732-2649db4864d8 h1:9Vw+DoN9MW+qPDQvW1B+X7t0ulOUmYM3HTv7Khvqvj0=
+github.com/sedaprotocol/seda-wasm-vm/tallyvm v0.0.0-20240617203732-2649db4864d8/go.mod h1:AaX9uRy6qD2q+o1SapTRnGUe9HHZWTmBN2BVNAptq3U=
 github.com/sedaprotocol/vrf-go v0.0.0-20231211075603-e5a17bb0b87c h1:PbSn7HpWeox6lqBu6Ba6YZS3On3euwn1BPz/egsnEgA=
 github.com/sedaprotocol/vrf-go v0.0.0-20231211075603-e5a17bb0b87c/go.mod h1:DEIXHk41VUzOMVbZnIApssPXtZ+2zrETDP7kJjGc1RM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=

proto/sedachain/wasm_storage/v1/wasm_storage.proto

@@ -14,7 +14,7 @@ message Wasm {
   google.protobuf.Timestamp added_at = 4
       [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
   // ExpirationHeight represents the block height at which the data request
-  // wasm will be pruned. The value of zero means no expiration.  
+  // wasm will be pruned. The value of zero means no expiration.
   int64 expiration_height = 5;
 }
 

scripts/deploy_contracts.sh

@@ -5,16 +5,15 @@ set -x
 CHAIN_ID=seda-1-local
 RPC_URL=http://127.0.0.1:26657
 BIN=$(git rev-parse --show-toplevel)/build/sedad
-ARTIFACTS_DIR=$(git rev-parse --show-toplevel)/testutil/testwasms # must contain proxy_contract.wasm, data_requests.wasm, and staking.wasm
+CONTRACT_WASM=$(git rev-parse --show-toplevel)/testutil/testwasms/seda_contract.wasm
 VOTING_PERIOD=30 # seconds
 DEV_ACCOUNT=$($BIN keys show satoshi --keyring-backend test -a) # for sending wasm-storage txs
 VOTE_ACCOUNT=$($BIN keys show satoshi --keyring-backend test -a) # for sending vote txs
 
 
 echo "Deploying proxy contract"
 
-# Proxy Contracts
-OUTPUT="$($BIN tx wasm store $ARTIFACTS_DIR/proxy_contract.wasm --node $RPC_URL --from $DEV_ACCOUNT --keyring-backend test --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)"
+OUTPUT="$($BIN tx wasm store $CONTRACT_WASM --node $RPC_URL --from $DEV_ACCOUNT --keyring-backend test --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)"
 TXHASH=$(echo $OUTPUT | jq -r '.txhash')
 
 sleep 10
@@ -25,7 +24,8 @@ PROXY_CODE_ID=$(echo "$OUTPUT" | jq -r '.events[] | select(.type=="store_code")
 echo "Instantiating proxy contract on code id $PROXY_CODE_ID"
 
 OUTPUT=$($BIN tx wasm-storage submit-proposal instantiate-and-register-proxy-contract $PROXY_CODE_ID \
-    '{"token":"aseda"}' 74657374696e67 \
+    '{"token":"aseda", "owner": "'$DEV_ACCOUNT'" }' \
+    74657374696e67 \
     --admin $DEV_ACCOUNT \
     --label proxy$PROXY_CODE_ID \
     --title 'Proxy Contract' --summary 'Instantiates and registers proxy contract' --deposit 10000000aseda \
@@ -47,65 +47,3 @@ sleep $VOTING_PERIOD
 
 PROXY_CONTRACT_ADDRESS=$($BIN query wasm-storage proxy-contract-registry --output json | jq -r '.address')
 echo "Deployed proxy contract to: $PROXY_CONTRACT_ADDRESS"
-
-# -----------------------
-# Data Requests
-# -----------------------
-
-echo "Deploying Data Request contract"
-
-OUTPUT="$($BIN tx wasm store $ARTIFACTS_DIR/data_requests.wasm --node $RPC_URL --from $DEV_ACCOUNT --keyring-backend test --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)"
-TXHASH=$(echo $OUTPUT | jq -r '.txhash')
-sleep 10
-OUTPUT="$($BIN query tx $TXHASH --node $RPC_URL --output json)"
-DRs_CODE_ID=$(echo "$OUTPUT" | jq -r '.events[] | select(.type=="store_code") | .attributes[] | select(.key=="code_id") | .value')
-
-echo "Instantiating data request contract on code id $DRs_CODE_ID"
-
-OUTPUT=$($BIN tx wasm instantiate $DRs_CODE_ID '{"token":"aseda", "proxy": "'$PROXY_CONTRACT_ADDRESS'" }' --no-admin --from $DEV_ACCOUNT --keyring-backend test --node $RPC_URL --label dr$DRs_CODE_ID --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)
-TXHASH=$(echo "$OUTPUT" | jq -r '.txhash')
-sleep 10
-OUTPUT="$($BIN query tx $TXHASH --node $RPC_URL --output json)"
-DRs_CONTRACT_ADDRESS=$(echo "$OUTPUT" | jq -r '.events[] | select(.type=="instantiate") | .attributes[] | select(.key=="_contract_address") | .value')
-
-echo "Deployed data request contract to: $DRs_CONTRACT_ADDRESS"
-
-# -----------------------
-# Staking
-# -----------------------
-
-echo "Deploying staking contract"
-
-OUTPUT="$($BIN tx wasm store $ARTIFACTS_DIR/staking.wasm --node $RPC_URL --from $DEV_ACCOUNT --keyring-backend test --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)"
-TXHASH=$(echo $OUTPUT | jq -r '.txhash')
-sleep 10
-OUTPUT="$($BIN query tx $TXHASH --node $RPC_URL --output json)"
-STAKING_CODE_ID=$(echo "$OUTPUT" | jq -r '.events[] | select(.type=="store_code") | .attributes[] | select(.key=="code_id") | .value')
-
-echo "Instantiating staking contract on code id $STAKING_CODE_ID"
-
-OUTPUT=$($BIN tx wasm instantiate $STAKING_CODE_ID '{"token":"aseda", "proxy":  "'$PROXY_CONTRACT_ADDRESS'" }' --no-admin --from $DEV_ACCOUNT --keyring-backend test --node $RPC_URL --label staking$staking_code_id --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)
-TXHASH=$(echo "$OUTPUT" | jq -r '.txhash')
-sleep 10
-OUTPUT="$($BIN query tx $TXHASH --node $RPC_URL --output json)"
-STAKING_CONTRACT_ADDRESS=$(echo "$OUTPUT" | jq -r '.events[] | select(.type=="instantiate") | .attributes[] | select(.key=="_contract_address") | .value')
-
-echo "Deployed staking contract to: $STAKING_CONTRACT_ADDRESS"
-
-# -----------------------
-# Setting properties
-# -----------------------
-
-echo "Setting dr address on proxy.."
-OUTPUT="$($BIN tx wasm execute $PROXY_CONTRACT_ADDRESS '{"set_data_requests":{"contract": "'$DRs_CONTRACT_ADDRESS'" }}' --from $DEV_ACCOUNT --keyring-backend test --node $RPC_URL --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)"
-TXHASH=$(echo "$OUTPUT" | jq -r '.txhash')
-sleep 10
-OUTPUT="$($BIN query tx $TXHASH --node $RPC_URL --output json)"
-echo "$OUTPUT"
-
-echo "Setting staking address on proxy.."
-OUTPUT="$($BIN tx wasm execute $PROXY_CONTRACT_ADDRESS '{"set_staking":{"contract": "'$STAKING_CONTRACT_ADDRESS'" }}' --from $DEV_ACCOUNT --keyring-backend test --node $RPC_URL --gas-prices 100000000000aseda --gas auto --gas-adjustment 1.3 -y --output json --chain-id $CHAIN_ID)"
-TXHASH=$(echo "$OUTPUT" | jq -r '.txhash')
-sleep 10
-OUTPUT="$($BIN query tx $TXHASH --node $RPC_URL --output json)"
-echo "$OUTPUT"

scripts/local_setup.sh

@@ -58,4 +58,4 @@ $BIN gentx satoshi 10000000000000000seda --keyring-backend test
 $BIN collect-gentxs
 
 # start the chain
-$BIN start || echo "Failed to start the chain"
+$BIN start --log_level debug || echo "Failed to start the chain"

scripts/mockgen.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+mockgen_cmd="mockgen"
+
+if ! [ -x "$(command -v $mockgen_cmd)" ]; then
+  echo "Error: $mockgen_cmd is not installed." >&2
+  exit 1
+fi
+
+# Generate mocks for the given package
+$mockgen_cmd -source=$GOPATH/pkg/mod/github.com/\!cosm\!wasm/wasmd@v0.50.0/x/wasm/types/exported_keepers.go -package testutil -destination x/wasm-storage/keeper/testutil/wasm_keepers_mock.go
+$mockgen_cmd -source=x/wasm-storage/types/expected_keepers.go -package testutil -destination x/wasm-storage/keeper/testutil/expected_keepers_mock.go

x/randomness/keeper/keeper.go

@@ -37,7 +37,7 @@ func NewKeeper(cdc codec.BinaryCodec, storeService storetypes.KVStoreService) *K
 
 	return &Keeper{
 		Seed:                collections.NewItem(sb, SeedPrefix, "seed", collections.StringValue),
-		ValidatorVRFPubKeys: collections.NewMap(sb, ValidatorVRFPrefix, "validator-vrf-pubkeys", collections.StringKey, codec.CollInterfaceValue[cryptotypes.PubKey](cdc)),
+		ValidatorVRFPubKeys: collections.NewMap(sb, ValidatorVRFPrefix, "validator_vrf_pubkeys", collections.StringKey, codec.CollInterfaceValue[cryptotypes.PubKey](cdc)),
 	}
 }
 

x/wasm-storage/genesis.go

@@ -15,6 +15,9 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) {
 	if err := k.Params.Set(ctx, data.Params); err != nil {
 		panic(err)
 	}
+	if err := k.ProxyContractRegistry.Set(ctx, data.ProxyContractRegistry); err != nil {
+		panic(err)
+	}
 
 	for i := range data.Wasms {
 		wasm := data.Wasms[i]
@@ -29,15 +32,6 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) {
 			}
 		}
 	}
-	if data.ProxyContractRegistry != "" {
-		proxyAddr, err := sdk.AccAddressFromBech32(data.ProxyContractRegistry)
-		if err != nil {
-			panic(err)
-		}
-		if err = k.ProxyContractRegistry.Set(ctx, proxyAddr.String()); err != nil {
-			panic(err)
-		}
-	}
 }
 
 // ExportGenesis extracts all data from store to genesis state.

x/wasm-storage/keeper/abci.go

@@ -1,18 +1,50 @@
 package keeper
 
 import (
+	"encoding/base64"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"sort"
+
 	"cosmossdk.io/collections"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/sedaprotocol/seda-wasm-vm/tallyvm"
 )
 
+type Request struct {
+	DrBinaryID        string                `json:"dr_binary_id"`
+	DrInputs          string                `json:"dr_inputs"`
+	GasLimit          string                `json:"gas_limit"`
+	GasPrice          string                `json:"gas_price"`
+	Height            uint64                `json:"height"`
+	ID                string                `json:"id"`
+	Memo              string                `json:"memo"`
+	PaybackAddress    string                `json:"payback_address"`
+	ReplicationFactor int64                 `json:"replication_factor"`
+	Reveals           map[string]RevealBody `json:"reveals"`
+	SedaPayload       string                `json:"seda_payload"`
+	TallyBinaryID     string                `json:"tally_binary_id"`
+	TallyInputs       string                `json:"tally_inputs"`
+	Version           string                `json:"version"`
+}
+
+type RevealBody struct {
+	ExitCode uint8  `json:"exit_code"`
+	Reveal   string `json:"reveal"` // base64-encoded string
+}
+
 func (k Keeper) EndBlock(ctx sdk.Context) error {
 	err := k.ProcessExpiredWasms(ctx)
 	if err != nil {
 		return err
 	}
 
-	// TODO: Add Tally VM
-
+	err = k.ExecuteTally(ctx)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -32,3 +64,94 @@ func (k Keeper) ProcessExpiredWasms(ctx sdk.Context) error {
 	}
 	return nil
 }
+
+func (k Keeper) ExecuteTally(ctx sdk.Context) error {
+	// 1. Get contract address.
+	contractAddr, err := k.ProxyContractRegistry.Get(ctx)
+	if contractAddr == "" || errors.Is(err, collections.ErrNotFound) {
+		k.Logger(ctx).Debug("proxy contract address not registered")
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+
+	// 2. Fetch tally-ready DRs.
+	queryRes, err := k.wasmViewKeeper.QuerySmart(ctx, sdk.MustAccAddressFromBech32(contractAddr), []byte(`{"get_data_requests_by_status":{"status": "tallying"}}`))
+	if err != nil {
+		return err
+	}
+	var tallyList []Request
+	err = json.Unmarshal(queryRes, &tallyList)
+	if err != nil {
+		return err
+	}
+
+	// 3. Loop through the list to apply filter and execute tally.
+	for id, req := range tallyList {
+		tallyInputs, err := base64.StdEncoding.DecodeString(req.TallyInputs)
+		if err != nil {
+			return fmt.Errorf("failed to decode tally input: %w", err)
+		}
+
+		// Sort reveals.
+		keys := make([]string, len(req.Reveals))
+		i := 0
+		for k := range req.Reveals {
+			keys[i] = k
+			i++
+		}
+		sort.Strings(keys)
+		reveals := make([]RevealBody, len(req.Reveals))
+		for i, k := range keys {
+			reveals[i] = req.Reveals[k]
+		}
+
+		outliers, consensus, err := ApplyFilter(tallyInputs, reveals)
+		if err != nil {
+			return err
+		}
+
+		tallyID, err := hex.DecodeString(req.TallyBinaryID)
+		if err != nil {
+			return fmt.Errorf("failed to decode tally ID to hex: %w", err)
+		}
+		tallyWasm, err := k.DataRequestWasm.Get(ctx, tallyID)
+		if err != nil {
+			return fmt.Errorf("failed to get tally wasm for DR ID %d: %w", id, err)
+		}
+
+		args, err := tallyVMArg(tallyInputs, req.Reveals, outliers)
+		if err != nil {
+			return err
+		}
+
+		result := tallyvm.ExecuteTallyVm(tallyWasm.Bytecode, args, map[string]string{
+			"CONSENSUS": fmt.Sprintf("%v", consensus),
+		})
+		fmt.Println(result)
+	}
+
+	// 4. Post results.
+	// msg := []byte("{\"data_requests\": {}}")
+	// drContractAddr, err := k.wasmKeeper.Sudo(ctx, sdk.MustAccAddressFromBech32(proxyContractAddr), msg)
+	// fmt.Println("dr contract addy: " + string(drContractAddr))
+
+	return nil
+}
+
+func tallyVMArg(inputArgs []byte, reveals map[string]RevealBody, outliers []bool) ([]string, error) {
+	arg := []string{string(inputArgs)}
+	r, err := json.Marshal(reveals)
+	if err != nil {
+		return nil, err
+	}
+	arg = append(arg, string(r))
+	o, err := json.Marshal(outliers)
+	if err != nil {
+		return nil, err
+	}
+	arg = append(arg, string(o))
+
+	return arg, err
+}