Skip to content

Commit

Permalink
impl movement batch circult (#832)
Browse files Browse the repository at this point in the history
  • Loading branch information
@huangzhiran
huangzhiran authored Feb 21, 2025
1 parent 636451f commit 665bbcf
Show file tree
Hide file tree
Showing 29 changed files with 1,931 additions and 409 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
View file

This file was deleted.

2 changes: 0 additions & 2 deletions .lfsconfig
View file

This file was deleted.

146 changes: 89 additions & 57 deletions e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/stretchr/testify/require"

"github.com/iotexproject/w3bstream/e2e/services"
"github.com/iotexproject/w3bstream/project"
"github.com/iotexproject/w3bstream/smartcontracts/go/mockdappmovementbatch"
)

const (
Expand Down Expand Up @@ -126,21 +128,28 @@ func TestE2E(t *testing.T) {
require.NoError(t, err)
deviceAddr := crypto.PubkeyToAddress(deviceKey.PublicKey)
sendETH(t, chainEndpoint, payerHex, deviceAddr, 20)
//registerIoID(t, chainEndpoint, contracts, deviceKey, projectID)

t.Run("gnark", func(t *testing.T) {
// Register project
projectOwnerKey, err := crypto.GenerateKey()
require.NoError(t, err)
projectOwnerAddr := crypto.PubkeyToAddress(projectOwnerKey.PublicKey)
sendETH(t, chainEndpoint, payerHex, projectOwnerAddr, 20)
projectID := big.NewInt(1)
registerIoID(t, chainEndpoint, contracts, deviceKey, projectID)
registerProject(t, chainEndpoint, contracts, projectOwnerKey, projectID, common.HexToAddress(contracts.MockDapp))
// Register device2
deviceKey2, err := crypto.GenerateKey()
require.NoError(t, err)
deviceAddr2 := crypto.PubkeyToAddress(deviceKey2.PublicKey)
sendETH(t, chainEndpoint, payerHex, deviceAddr2, 20)

// Register project
projectOwnerKey, err := crypto.GenerateKey()
require.NoError(t, err)
projectOwnerAddr := crypto.PubkeyToAddress(projectOwnerKey.PublicKey)
sendETH(t, chainEndpoint, payerHex, projectOwnerAddr, 20)
projectID := big.NewInt(1)
registerIoID(t, chainEndpoint, contracts, deviceKey, projectID)
registerIoID(t, chainEndpoint, contracts, deviceKey2, projectID)
registerProject(t, chainEndpoint, contracts, projectOwnerKey, projectID)

t.Run("gnark", func(t *testing.T) {
bindProjectDapp(t, chainEndpoint, contracts, projectOwnerKey, projectID, common.HexToAddress(contracts.MockDapp))
gnarkCodePath := "./testdata/gnark.code"
gnarkMetadataPath := "./testdata/gnark.metadata"
project := &project.Project{Configs: []*project.Config{{Version: "v1", VMTypeID: 1}}}
project := &project.Project{DefaultVersion: "v1", Configs: []*project.Config{{Version: "v1", VMTypeID: 1}}}
// Upload project
uploadProject(t, chainEndpoint, ipfsEndpoint, project, &gnarkCodePath, &gnarkMetadataPath, contracts, projectOwnerKey, projectID)
require.NoError(t, err)
Expand All @@ -149,28 +158,22 @@ func TestE2E(t *testing.T) {
// Send message: prove 1+1=2
data, err := hex.DecodeString("00000001000000010000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001")
require.NoError(t, err)
taskid := sendMessage(t, data, projectID, nil, deviceKey, apiNodeUrl)
waitSettled(t, taskid, apiNodeUrl)
taskid := sendMessage(t, data, projectID, project.Configs[0], deviceKey, apiNodeUrl)
waitSettled(t, taskid, apiNodeUrl, 30*time.Second, 30*time.Second)
})
t.Run("gnark-liveness", func(t *testing.T) {
t.Skip()
// Register project
projectOwnerKey, err := crypto.GenerateKey()
require.NoError(t, err)
projectOwnerAddr := crypto.PubkeyToAddress(projectOwnerKey.PublicKey)
sendETH(t, chainEndpoint, payerHex, projectOwnerAddr, 20)
projectID := big.NewInt(2)
registerIoID(t, chainEndpoint, contracts, deviceKey, projectID)
registerProject(t, chainEndpoint, contracts, projectOwnerKey, projectID, common.HexToAddress(contracts.MockDappLiveness))

bindProjectDapp(t, chainEndpoint, contracts, projectOwnerKey, projectID, common.HexToAddress(contracts.MockDappLiveness))
gnarkCodePath := "./testdata/pebble.circuit"
gnarkMetadataPath := "./testdata/pebble.pk"
project := &project.Project{Configs: []*project.Config{{
Version: "v1",
VMTypeID: 1,
ProofType: "liveness",
SignedKeys: []project.SignedKey{{Name: "timestamp", Type: "uint64"}},
}}}
project := &project.Project{
DefaultVersion: "v2",
Configs: []*project.Config{{
Version: "v2",
VMTypeID: 1,
ProofType: "liveness",
SignedKeys: []project.SignedKey{{Name: "timestamp", Type: "uint64"}},
}}}

// Upload project
uploadProject(t, chainEndpoint, ipfsEndpoint, project, &gnarkCodePath, &gnarkMetadataPath, contracts, projectOwnerKey, projectID)
Expand All @@ -186,33 +189,29 @@ func TestE2E(t *testing.T) {
})
require.NoError(t, err)
taskid := sendMessage(t, data, projectID, project.Configs[0], deviceKey, apiNodeUrl)
waitSettled(t, taskid, apiNodeUrl)
waitSettled(t, taskid, apiNodeUrl, 30*time.Second, 30*time.Second)
})
t.Run("gnark-movement", func(t *testing.T) {
t.Skip()
// Register project
projectOwnerKey, err := crypto.GenerateKey()
require.NoError(t, err)
projectOwnerAddr := crypto.PubkeyToAddress(projectOwnerKey.PublicKey)
sendETH(t, chainEndpoint, payerHex, projectOwnerAddr, 20)
projectID := big.NewInt(3)
registerIoID(t, chainEndpoint, contracts, deviceKey, projectID)
registerProject(t, chainEndpoint, contracts, projectOwnerKey, projectID, common.HexToAddress(contracts.MockDappMovement))

gnarkCodePath := "./testdata/geodnet.circuit"
gnarkMetadataPath := "./testdata/geodnet.pk"
project := &project.Project{Configs: []*project.Config{{
Version: "v1",
VMTypeID: 1,
ProofType: "movement",
SignedKeys: []project.SignedKey{
{Name: "timestamp", Type: "uint64"},
{Name: "latitude", Type: "uint64"},
{Name: "longitude", Type: "uint64"}},
}}}

uploadProject(t, chainEndpoint, ipfsEndpoint, project, &gnarkCodePath, &gnarkMetadataPath, contracts, projectOwnerKey, projectID)
bindProjectDapp(t, chainEndpoint, contracts, projectOwnerKey, projectID, common.HexToAddress(contracts.MockDappMovementBatch))
project := &project.Project{
DefaultVersion: "v3",
Configs: []*project.Config{{
Version: "v3",
VMTypeID: 1,
ProofType: "movement",
Code: "ipfs://ipfs.mainnet.iotex.io/QmSg3NFgVbHZyUZsHAjrLV7o8CmLKYChNa3CVi4uKKrHeL",
CodeHash: "0xdc3392204a56698891090ea1b729b7a25deba50ccad26ef70ff4b3d51f662ce4",
Metadata: "ipfs://ipfs.mainnet.iotex.io/QmTXxKjQEQ8gAzgJjvoxoMB5ocYi16VimHjFwTKf6hEHSm",
MetadataHash: "0xc969f436f4cef28377e3b5ec3ca2457bcaab2795f65c4e1bf3656b57087cd957",
TaskProcessingBatch: 10,
SignedKeys: []project.SignedKey{
{Name: "timestamp", Type: "uint64"},
{Name: "latitude", Type: "uint64"},
{Name: "longitude", Type: "uint64"}},
}}}

uploadProject(t, chainEndpoint, ipfsEndpoint, project, nil, nil, contracts, projectOwnerKey, projectID)
// Wait a few seconds for the device info synced on api node
time.Sleep(2 * time.Second)

Expand Down Expand Up @@ -243,9 +242,42 @@ func TestE2E(t *testing.T) {
Longitude: lastLongitude,
})
require.NoError(t, err)
_ = sendMessage(t, lastData, projectID, project.Configs[0], deviceKey, apiNodeUrl)
taskID := sendMessage(t, data, projectID, project.Configs[0], deviceKey, apiNodeUrl)
waitSettled(t, taskID, apiNodeUrl)
taskID := ""
for i := 0; i < 4; i++ {
_ = sendMessage(t, lastData, projectID, project.Configs[0], deviceKey, apiNodeUrl)
taskID = sendMessage(t, data, projectID, project.Configs[0], deviceKey, apiNodeUrl)
time.Sleep(2 * time.Second)
}
for i := 0; i < 2; i++ {
_ = sendMessage(t, lastData, projectID, project.Configs[0], deviceKey, apiNodeUrl)
taskID = sendMessage(t, lastData, projectID, project.Configs[0], deviceKey, apiNodeUrl)
time.Sleep(2 * time.Second)
}
for i := 0; i < 3; i++ {
_ = sendMessage(t, lastData, projectID, project.Configs[0], deviceKey2, apiNodeUrl)
taskID = sendMessage(t, data, projectID, project.Configs[0], deviceKey2, apiNodeUrl)
time.Sleep(2 * time.Second)
}
for i := 0; i < 1; i++ {
_ = sendMessage(t, lastData, projectID, project.Configs[0], deviceKey2, apiNodeUrl)
taskID = sendMessage(t, lastData, projectID, project.Configs[0], deviceKey2, apiNodeUrl)
time.Sleep(2 * time.Second)
}
waitSettled(t, taskID, apiNodeUrl, 30*time.Second, 10*time.Minute)

client, err := ethclient.Dial(chainEndpoint)
require.NoError(t, err)
mockDappMovementBatchContract, err := mockdappmovementbatch.NewMockdappmovementbatch(
common.HexToAddress(contracts.MockDappMovementBatch), client)
require.NoError(t, err)

n, err := mockDappMovementBatchContract.DeviceTick(nil, crypto.PubkeyToAddress(deviceKey.PublicKey))
require.NoError(t, err)
require.Equal(t, n, uint64(4), "unexpect tick count")

n, err = mockDappMovementBatchContract.DeviceTick(nil, crypto.PubkeyToAddress(deviceKey2.PublicKey))
require.NoError(t, err)
require.Equal(t, n, uint64(3), "unexpect tick count")
})
}

Expand All @@ -260,7 +292,7 @@ func sendMessage(t *testing.T, dataJson []byte, projectID *big.Int,
return taskID
}

func waitSettled(t *testing.T, taskID string, apiNodeUrl string) {
func waitSettled(t *testing.T, taskID string, apiNodeUrl string, assigned, settled time.Duration) {
err := waitUntil(func() (bool, error) {
states, err := queryTask(taskID, apiNodeUrl)
if err != nil {
Expand All @@ -272,7 +304,7 @@ func waitSettled(t *testing.T, taskID string, apiNodeUrl string) {
}
}
return false, nil
}, 30*time.Second)
}, assigned)
require.NoError(t, err)

err = waitUntil(func() (bool, error) {
Expand All @@ -286,6 +318,6 @@ func waitSettled(t *testing.T, taskID string, apiNodeUrl string) {
}
}
return false, nil
}, 120*time.Second)
}, settled)
require.NoError(t, err)
}
27 changes: 19 additions & 8 deletions e2e/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,24 @@ func proverInit(chDSN, dbFile, chainEndpoint string, vmEndpoints map[int]string,
return prover, key, nil
}

func bindProjectDapp(t *testing.T, chainEndpoint string, contractDeployments *services.ContractsDeployments,
projectOwner *ecdsa.PrivateKey, projectID *big.Int, dpp common.Address) {
client, err := ethclient.Dial(chainEndpoint)
require.NoError(t, err)
chainID, err := client.ChainID(context.Background())
require.NoError(t, err)
tOpts, err := bind.NewKeyedTransactorWithChainID(projectOwner, chainID)
require.NoError(t, err)
router, err := router.NewRouter(common.HexToAddress(contractDeployments.Router), client)
require.NoError(t, err)
tx, err := router.BindDapp(tOpts, projectID, dpp)
require.NoError(t, err)
_, err = services.WaitForTransactionReceipt(client, tx.Hash())
require.NoError(t, err)
}

func registerProject(t *testing.T, chainEndpoint string,
contractDeployments *services.ContractsDeployments, projectOwner *ecdsa.PrivateKey, projectID *big.Int, dpp common.Address) {
contractDeployments *services.ContractsDeployments, projectOwner *ecdsa.PrivateKey, projectID *big.Int) {
client, err := ethclient.Dial(chainEndpoint)
require.NoError(t, err)
chainID, err := client.ChainID(context.Background())
Expand Down Expand Up @@ -185,12 +201,9 @@ func registerProject(t *testing.T, chainEndpoint string,
_, err = services.WaitForTransactionReceipt(client, tx.Hash())
require.NoError(t, err)

// Bind dapp to router
router, err := router.NewRouter(common.HexToAddress(contractDeployments.Router), client)
require.NoError(t, err)
tx, err = router.BindDapp(tOpts, projectID, dpp)
wsProject, err := project.NewProject(common.HexToAddress(contractDeployments.WSProject), client)
require.NoError(t, err)
_, err = services.WaitForTransactionReceipt(client, tx.Hash())
tx, err = wsProject.Resume(tOpts, projectID)
require.NoError(t, err)
}

Expand Down Expand Up @@ -232,8 +245,6 @@ func uploadProject(t *testing.T, chainEndpoint, ipfsURL string,
require.NoError(t, err)
_, err = services.WaitForTransactionReceipt(client, tx.Hash())
require.NoError(t, err)
tx, err = wsProject.Resume(tOpts, newProjectID)
require.NoError(t, err)
_, err = services.WaitForTransactionReceipt(client, tx.Hash())
require.NoError(t, err)
}
Expand Down
56 changes: 28 additions & 28 deletions e2e/services/contractdeploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@ const (
)

var (
taskManagerRe = regexp.MustCompile(`W3bstreamTaskManager deployed to (\S+)`)
proverRe = regexp.MustCompile(`W3bstreamProver deployed to (\S+)`)
minterRe = regexp.MustCompile(`W3bstreamMinter deployed to (\S+)`)
projectRegistrarRe = regexp.MustCompile(`ProjectRegistrar deployed to (\S+)`)
mockProjectRe = regexp.MustCompile(`MockProject deployed to (\S+)`)
wsProjectRe = regexp.MustCompile(`W3bstreamProject deployed to (\S+)`)
routerRe = regexp.MustCompile(`W3bstreamRouter deployed to (\S+)`)
mockDappRe = regexp.MustCompile(`MockDapp deployed to (\S+)`)
mockDappLivenessRe = regexp.MustCompile(`MockDappLiveness deployed to (\S+)`)
mockDappMovementRe = regexp.MustCompile(`MockDappMovement deployed to (\S+)`)
projectRewardRe = regexp.MustCompile(`W3bstreamProjectReward deployed to (\S+)`)
debitsRe = regexp.MustCompile(`W3bstreamDebits deployed to (\S+)`)
ioIDRe = regexp.MustCompile(`MockIoID deployed to (\S+)`)
taskManagerRe = regexp.MustCompile(`W3bstreamTaskManager deployed to (\S+)`)
proverRe = regexp.MustCompile(`W3bstreamProver deployed to (\S+)`)
minterRe = regexp.MustCompile(`W3bstreamMinter deployed to (\S+)`)
projectRegistrarRe = regexp.MustCompile(`ProjectRegistrar deployed to (\S+)`)
mockProjectRe = regexp.MustCompile(`MockProject deployed to (\S+)`)
wsProjectRe = regexp.MustCompile(`W3bstreamProject deployed to (\S+)`)
routerRe = regexp.MustCompile(`W3bstreamRouter deployed to (\S+)`)
mockDappRe = regexp.MustCompile(`MockDapp deployed to (\S+)`)
mockDappLivenessRe = regexp.MustCompile(`MockDappLiveness deployed to (\S+)`)
mockDappMovementBatchRe = regexp.MustCompile(`MockDappMovementBatch deployed to (\S+)`)
projectRewardRe = regexp.MustCompile(`W3bstreamProjectReward deployed to (\S+)`)
debitsRe = regexp.MustCompile(`W3bstreamDebits deployed to (\S+)`)
ioIDRe = regexp.MustCompile(`MockIoID deployed to (\S+)`)
)

type ContractsDeployments struct {
TaskManager string
Prover string
Minter string
Registrar string
MockProject string
WSProject string
Router string
MockDapp string
MockDappLiveness string
MockDappMovement string
ProjectReward string
Debits string
IoID string
TaskManager string
Prover string
Minter string
Registrar string
MockProject string
WSProject string
Router string
MockDapp string
MockDappLiveness string
MockDappMovementBatch string
ProjectReward string
Debits string
IoID string
}

func DeployContract(endpoint string, payerHex string) (*ContractsDeployments, error) {
Expand Down Expand Up @@ -110,8 +110,8 @@ func DeployContract(endpoint string, payerHex string) (*ContractsDeployments, er
if match := mockDappLivenessRe.FindStringSubmatch(output); len(match) > 1 {
deployments.MockDappLiveness = match[1]
}
if match := mockDappMovementRe.FindStringSubmatch(output); len(match) > 1 {
deployments.MockDappMovement = match[1]
if match := mockDappMovementBatchRe.FindStringSubmatch(output); len(match) > 1 {
deployments.MockDappMovementBatch = match[1]
}
if match := routerRe.FindStringSubmatch(output); len(match) > 1 {
deployments.Router = match[1]
Expand Down
7 changes: 4 additions & 3 deletions e2e/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ import (

func signMesssage(data []byte, projectID uint64, cfg *project.Config, key *ecdsa.PrivateKey) ([]byte, error) {
req := &api.CreateTaskReq{
Nonce: uint64(time.Now().Unix()),
ProjectID: strconv.Itoa(int(projectID)),
Payload: data,
Nonce: uint64(time.Now().Unix()),
ProjectID: strconv.Itoa(int(projectID)),
ProjectVersion: cfg.Version,
Payload: data,
}

reqJson, err := json.Marshal(req)
Expand Down
Loading

0 comments on commit 665bbcf

Please sign in to comment.