Merge pull request #545 from LF-Decentralized-Trust-labs/zeto-lock

Zeto lock support

Author: jimthematrix

build.gradle

@@ -209,44 +209,30 @@ task copyZetoZKPFiles(type: Copy) {
         include 'anon_enc_batch-vkey.json'
         include 'anon_enc_batch_js/anon_enc_batch.wasm'
         // anon_nullifier
-        include 'anon_nullifier.zkey'
-        include 'anon_nullifier-vkey.json'
-        include 'anon_nullifier_js/anon_nullifier.wasm'
-        include 'anon_nullifier_batch.zkey'
-        include 'anon_nullifier_batch-vkey.json'
-        include 'anon_nullifier_batch_js/anon_nullifier_batch.wasm'
+        include 'anon_nullifier_transfer.zkey'
+        include 'anon_nullifier_transfer-vkey.json'
+        include 'anon_nullifier_transfer_js/anon_nullifier_transfer.wasm'
+        include 'anon_nullifier_transfer_batch.zkey'
+        include 'anon_nullifier_transfer_batch-vkey.json'
+        include 'anon_nullifier_transfer_batch_js/anon_nullifier_transfer_batch.wasm'
         // deposit
-        include 'check_hashes_value.zkey'
-        include 'check_hashes_value-vkey.json'
-        include 'check_hashes_value_js/check_hashes_value.wasm'
+        include 'deposit.zkey'
+        include 'deposit-vkey.json'
+        include 'deposit_js/deposit.wasm'
         // withdraw
-        include 'check_inputs_outputs_value.zkey'
-        include 'check_inputs_outputs_value-vkey.json'
-        include 'check_inputs_outputs_value_js/check_inputs_outputs_value.wasm'
-        include 'check_inputs_outputs_value_batch.zkey'
-        include 'check_inputs_outputs_value_batch-vkey.json'
-        include 'check_inputs_outputs_value_batch_js/check_inputs_outputs_value_batch.wasm'
+        include 'withdraw.zkey'
+        include 'withdraw-vkey.json'
+        include 'withdraw_js/withdraw.wasm'
+        include 'withdraw_batch.zkey'
+        include 'withdraw_batch-vkey.json'
+        include 'withdraw_batch_js/withdraw_batch.wasm'
         // withdraw_nullifier
-        include 'check_nullifiers_value.zkey'
-        include 'check_nullifiers_value-vkey.json'
-        include 'check_nullifiers_value_js/check_nullifiers_value.wasm'
-        include 'check_nullifiers_value_batch.zkey'
-        include 'check_nullifiers_value_batch-vkey.json'
-        include 'check_nullifiers_value_batch_js/check_nullifiers_value_batch.wasm'
-        // check_utxos_owner
-        include 'check_utxos_owner.zkey'
-        include 'check_utxos_owner-vkey.json'
-        include 'check_utxos_owner_js/check_utxos_owner.wasm'
-        include 'check_utxos_owner_batch.zkey'
-        include 'check_utxos_owner_batch-vkey.json'
-        include 'check_utxos_owner_batch_js/check_utxos_owner_batch.wasm'
-        // check_nullifiers_owner
-        include 'check_nullifiers_owner.zkey'
-        include 'check_nullifiers_owner-vkey.json'
-        include 'check_nullifiers_owner_js/check_nullifiers_owner.wasm'
-        include 'check_nullifiers_owner_batch.zkey'
-        include 'check_nullifiers_owner_batch-vkey.json'
-        include 'check_nullifiers_owner_batch_js/check_nullifiers_owner_batch.wasm'
+        include 'withdraw_nullifier.zkey'
+        include 'withdraw_nullifier-vkey.json'
+        include 'withdraw_nullifier_js/withdraw_nullifier.wasm'
+        include 'withdraw_nullifier_batch.zkey'
+        include 'withdraw_nullifier_batch-vkey.json'
+        include 'withdraw_nullifier_batch_js/withdraw_nullifier_batch.wasm'
     }
     into zetoZkpDir
 

core/go/internal/identityresolver/identityresolver_test.go

@@ -3,11 +3,64 @@ package identityresolver
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/kaleido-io/paladin/config/pkg/pldconf"
+	"github.com/kaleido-io/paladin/core/mocks/componentmocks"
+	"github.com/kaleido-io/paladin/toolkit/pkg/algorithms"
+	"github.com/kaleido-io/paladin/toolkit/pkg/cache"
+	"github.com/kaleido-io/paladin/toolkit/pkg/pldapi"
+	"github.com/kaleido-io/paladin/toolkit/pkg/verifiers"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
+func TestResolveVerifier(t *testing.T) {
+	r := &identityResolver{}
+	_, err := r.ResolveVerifier(context.Background(), "something$bad", "bad algorithm", "bad type")
+	assert.ErrorContains(t, err, "PD020006: Locator string something$bad is invalid")
+
+	capacity := 100
+	config := &pldconf.CacheConfig{Capacity: &capacity}
+	r = &identityResolver{
+		nodeName:      "testnode",
+		verifierCache: cache.NewCache[string, string](config, config),
+		keyManager:    componentmocks.NewKeyManager(t),
+	}
+	waitChan := make(chan time.Time)
+	resolvedKey := &pldapi.KeyMappingAndVerifier{
+		Verifier: &pldapi.KeyVerifier{
+			Verifier: "0x1234567890abcdef",
+			Type:     "ETH_ADDRESS",
+		},
+	}
+	r.keyManager.(*componentmocks.KeyManager).On("ResolveKeyNewDatabaseTX", mock.Anything, mock.Anything, mock.Anything, mock.Anything).WaitUntil(waitChan).Return(resolvedKey, nil)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
+	defer func() {
+		cancel()
+		close(waitChan)
+	}()
+
+	done := make(chan bool)
+	go func() {
+		_, err := r.ResolveVerifier(ctx, "something@testnode", algorithms.Curve_SECP256K1, verifiers.ETH_ADDRESS)
+		assert.ErrorContains(t, err, "PD010301: Context canceled")
+		done <- true
+	}()
+	<-done
+}
+
+func TestResolveVerifierAsync(t *testing.T) {
+	r := &identityResolver{}
+	resolved := func(ctx context.Context, verifier string) {
+		t.Logf("Resolved verifier: %s", verifier)
+	}
+	errhandler := func(ctx context.Context, err error) {
+		assert.ErrorContains(t, err, "PD020006: Locator string something$bad is invalid")
+	}
+	r.ResolveVerifierAsync(context.Background(), "something$bad", "bad algorithm", "bad type", resolved, errhandler)
+}
+
 func TestNewIdentityResolver(t *testing.T) {
 	capacity := 100
 	ctx := context.Background()

domains/integration-test/build.gradle

@@ -45,6 +45,10 @@ configurations {
         canBeConsumed = false
         canBeResolved = true
     }
+    poseidonArtifacts {
+        canBeConsumed = false
+        canBeResolved = true
+    }
 }
 
 dependencies {
@@ -54,6 +58,7 @@ dependencies {
     notoGo project(path: ":domains:noto", configuration: "goSource")
     zetoGo project(path: ":domains:zeto", configuration: "goSource")
     zetoArtifacts project(path: ":domains:zeto", configuration: "zetoArtifacts")
+    poseidonArtifacts project(path: ":domains:zeto", configuration: "poseidonArtifacts")
 }
 
 task copySolidity(type: Copy) {
@@ -75,6 +80,12 @@ task copySolidity(type: Copy) {
         exclude '**/*.dbg.json'
     }
 
+    inputs.files(configurations.poseidonArtifacts)
+    from fileTree(configurations.poseidonArtifacts.asPath) {
+        include '**/Poseidon2.json'
+        include '**/Poseidon3.json'
+    }
+
     into 'helpers/abis'
 
     // Flatten all paths into the destination folder
@@ -98,7 +109,7 @@ task test(type: Exec, dependsOn: [":core:go:makeMocks"]) {
     args '-v'
     args '-cover'
     args '-covermode=atomic'
-    args '-timeout=120s'
+    args '-timeout=480s'
     args "-test.gocoverdir=${projectDir}/coverage"
 
     dependsOn ':testinfra:startTestInfra'