Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and simplify zeto config #363

Merged
merged 7 commits into from
Nov 4, 2024
Merged

Update and simplify zeto config #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56d0605
Remove need to supply full ABIs as part of config
peterbroadhurst Nov 1, 2024
d507609
Remove unnecessary addresses from config
peterbroadhurst Nov 1, 2024
34a4433
Add zeto circuit configuration to build and CR
peterbroadhurst Nov 1, 2024
80c0278
Fix domain integration test too
peterbroadhurst Nov 1, 2024
eb8554d
Remove duplicate "from" field in constructor params for Zeto
peterbroadhurst Nov 1, 2024
002ad43
Fix firefly-signer import
peterbroadhurst Nov 1, 2024
8ac7253
Fix zeto factory to use the wrapper from Paladin
jimthematrix Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,24 @@ def transports = [
def uiClient = [
'ui/client/dist',
]

// These can be very large binaries, so adding to this list in the base image should be done with care.
// Likely if the range of circuits grows, a separate docker tag will be required for builds
// of Paladin that have a wider range of pre-built circuits included.
def zetoZKP = [
// anon
'domains/zeto/zkp/anon.zkey',
'domains/zeto/zkp/anon-vkey.json',
'domains/zeto/zkp/anon_js',
// anon_enc
'domains/zeto/zkp/anon_enc.zkey',
'domains/zeto/zkp/anon_enc-vkey.json',
'domains/zeto/zkp/anon_enc_js',
// anon_nullifier
'domains/zeto/zkp/anon_nullifier.zkey',
'domains/zeto/zkp/anon_nullifier-vkey.json',
'domains/zeto/zkp/anon_nullifier_js',
]

def assembleSubprojects = [
':core:go',
Expand Down Expand Up @@ -185,14 +203,33 @@ task copyUIFiles(type: Copy) {
}
}

task copyZetoZKPFiles(type: Copy) {
def zetoZkpDir = file("${buildDir}/domains/zeto/zkp")

doFirst {
zetoZkpDir.mkdirs()
}

zetoZKP.each { file ->
from file
}
into zetoZkpDir

outputs.upToDateWhen { false }

doLast {
println "Copied zetoZkp files to ${zetoZkpDir}"
}
}

// Root assemble task that depends on subproject's assemble tasks
task assemble {
assembleSubprojects.each { projectPath ->
dependsOn "${projectPath}:assemble"
}
}

assemble.finalizedBy(copyLibraries, copyDomains, copyRegistries, copyTransports, copyUIFiles)
assemble.finalizedBy(copyLibraries, copyDomains, copyRegistries, copyTransports, copyUIFiles, copyZetoZKPFiles)

defaultTasks 'build'

Expand Down
4 changes: 0 additions & 4 deletions core/go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.22.5

require (
github.com/DATA-DOG/go-sqlmock v1.5.2
github.com/alecthomas/assert v1.0.0
github.com/go-resty/resty/v2 v2.14.0
github.com/golang-migrate/migrate/v4 v4.17.1
github.com/google/uuid v1.6.0
Expand Down Expand Up @@ -40,8 +39,6 @@ require (

require (
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
github.com/alecthomas/colour v0.1.0 // indirect
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd v0.24.2 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
Expand Down Expand Up @@ -90,7 +87,6 @@ require (
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
Expand Down
20 changes: 0 additions & 20 deletions core/go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
github.com/aidarkhanov/nanoid v1.0.8 h1:yxyJkgsEDFXP7+97vc6JevMcjyb03Zw+/9fqhlVXBXA=
github.com/aidarkhanov/nanoid v1.0.8/go.mod h1:vadfZHT+m4uDhttg0yY4wW3GKtl2T6i4d2Age+45pYk=
github.com/alecthomas/assert v1.0.0 h1:3XmGh/PSuLzDbK3W2gUbRXwgW5lqPkuqvRgeQ30FI5o=
github.com/alecthomas/assert v1.0.0/go.mod h1:va/d2JC+M7F6s+80kl/R3G7FUiW6JzUO+hPhLyJ36ZY=
github.com/alecthomas/colour v0.1.0 h1:nOE9rJm6dsZ66RGWYSFrXw461ZIt9A6+nHgL7FRrDUk=
github.com/alecthomas/colour v0.1.0/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48=
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
Expand Down Expand Up @@ -125,12 +119,6 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hyperledger/firefly-common v1.4.11 h1:WKv2hQuNpS7yP51THxzpzrqU3jkln23C9vq5iminzBk=
github.com/hyperledger/firefly-common v1.4.11/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
github.com/hyperledger/firefly-signer v1.1.18 h1:W3ED5LSUQOBa9OkWnkv9Sn8iJs6hJ1AU6RidUkgh0/A=
github.com/hyperledger/firefly-signer v1.1.18/go.mod h1:HDaDdht94JypRTunRGrcPL5Pvxfh4yigjatTrie5JUI=
github.com/hyperledger/firefly-signer v1.1.19-0.20241024004807-eafd71c97692 h1:M/GpUfc4UyuWytZBKnDl9Qs7mjCkWDPQ3OJ/K7ivbE8=
github.com/hyperledger/firefly-signer v1.1.19-0.20241024004807-eafd71c97692/go.mod h1:HDaDdht94JypRTunRGrcPL5Pvxfh4yigjatTrie5JUI=
github.com/hyperledger/firefly-signer v1.1.19-0.20241024010504-13d52d4241be h1:d74qwNo0KzAfBdjn0VcTYKTulgIXWsGgh0y6HQPOS/4=
github.com/hyperledger/firefly-signer v1.1.19-0.20241024010504-13d52d4241be/go.mod h1:HDaDdht94JypRTunRGrcPL5Pvxfh4yigjatTrie5JUI=
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e h1:iqIs0NPtE9h1Vy4WBm2dsS4XbBIdpZPMNprlwdmIC0U=
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e/go.mod h1:HDaDdht94JypRTunRGrcPL5Pvxfh4yigjatTrie5JUI=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
Expand Down Expand Up @@ -160,11 +148,8 @@ github.com/karlseguin/ccache v2.0.3+incompatible h1:j68C9tWOROiOLWTS/kCGg9IcJG+A
github.com/karlseguin/ccache v2.0.3+incompatible/go.mod h1:CM9tNPzT6EdRh14+jiW8mEF9mkNZuuE51qmgGYUB93w=
github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
Expand Down Expand Up @@ -241,8 +226,6 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b h1:h+3JX2VoWTFuyQEo87pStk/a99dzIO1mM9KxIyLPGTU=
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
Expand All @@ -265,7 +248,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
Expand Down Expand Up @@ -405,7 +387,6 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
Expand All @@ -416,7 +397,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
Expand Down
2 changes: 1 addition & 1 deletion core/go/pkg/persistence/testdb_sqlite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"context"
"testing"

"github.com/alecthomas/assert"
"github.com/golang-migrate/migrate/v4"
"github.com/kaleido-io/paladin/config/pkg/confutil"
"github.com/kaleido-io/paladin/config/pkg/pldconf"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions domains/integration-test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ go 1.22.5
require (
github.com/go-resty/resty/v2 v2.14.0
github.com/hyperledger/firefly-common v1.4.11
github.com/hyperledger/firefly-signer v1.1.18
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e
github.com/kaleido-io/paladin/config v0.0.0-00010101000000-000000000000
github.com/kaleido-io/paladin/core v0.0.0-00010101000000-000000000000
github.com/kaleido-io/paladin/domains/noto v0.0.0-00010101000000-000000000000
github.com/kaleido-io/paladin/domains/zeto v0.0.0-00010101000000-000000000000
github.com/kaleido-io/paladin/toolkit v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.9.0
gopkg.in/yaml.v2 v2.4.0
)

require (
Expand Down Expand Up @@ -105,6 +104,7 @@ require (
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/postgres v1.5.9 // indirect
gorm.io/driver/sqlite v1.5.6 // indirect
Expand Down
2 changes: 1 addition & 1 deletion domains/integration-test/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
github.com/hyperledger-labs/zeto/go-sdk v0.0.0-20241004174307-aa3c1fdf0966 h1:J5ZVvMRxRlM1GLtUdPTCNNRpB4QpJij/+ndud1QU8WY=
github.com/hyperledger/firefly-common v1.4.11 h1:WKv2hQuNpS7yP51THxzpzrqU3jkln23C9vq5iminzBk=
github.com/hyperledger/firefly-common v1.4.11/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
github.com/hyperledger/firefly-signer v1.1.18 h1:W3ED5LSUQOBa9OkWnkv9Sn8iJs6hJ1AU6RidUkgh0/A=
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e h1:iqIs0NPtE9h1Vy4WBm2dsS4XbBIdpZPMNprlwdmIC0U=
github.com/iden3/go-iden3-crypto v0.0.17 h1:NdkceRLJo/pI4UpcjVah4lN/a3yzxRUGXqxbWcYh9mY=
github.com/iden3/go-iden3-crypto v0.0.17/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
github.com/iden3/go-rapidsnark/prover v0.0.12 h1:IOqZrK+0J91zU7goB74qAzdwPg1ZRpZvsGjgpz4c+MQ=
Expand Down
3 changes: 1 addition & 2 deletions domains/integration-test/helpers/zeto_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ type ZetoHelper struct {

func DeployZeto(ctx context.Context, t *testing.T, rpc rpcbackend.Backend, domainName, controllerName, tokenName string) *ZetoHelper {
var addr tktypes.EthAddress
rpcerr := rpc.CallRPC(ctx, &addr, "testbed_deploy", domainName, "me", &types.InitializerParams{
From: controllerName,
rpcerr := rpc.CallRPC(ctx, &addr, "testbed_deploy", domainName, controllerName, &types.InitializerParams{
TokenName: tokenName,
})
if rpcerr != nil {
Expand Down
2 changes: 1 addition & 1 deletion domains/integration-test/pvp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func TestNotoForZeto(t *testing.T) {
waitForNoto, notoTestbed := newNotoDomain(t, &nototypes.DomainConfig{
FactoryAddress: contracts["noto"],
})
waitForZeto, zetoTestbed := newZetoDomain(t, zetoConfig)
waitForZeto, zetoTestbed := newZetoDomain(t, zetoConfig, zetoContracts.FactoryAddress)
done, _, tb, rpc := newTestbed(t, hdWalletSeed, map[string]*testbed.TestbedDomain{
notoDomainName: notoTestbed,
zetoDomainName: zetoTestbed,
Expand Down
4 changes: 2 additions & 2 deletions domains/integration-test/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func newNotoDomain(t *testing.T, config *nototypes.DomainConfig) (chan noto.Noto
return waitForDomain, tbd
}

func newZetoDomain(t *testing.T, config *zetotypes.DomainFactoryConfig) (chan zeto.Zeto, *testbed.TestbedDomain) {
func newZetoDomain(t *testing.T, config *zetotypes.DomainFactoryConfig, factoryAddress *tktypes.EthAddress) (chan zeto.Zeto, *testbed.TestbedDomain) {
waitForDomain := make(chan zeto.Zeto, 1)
tbd := &testbed.TestbedDomain{
Config: mapConfig(t, config),
Expand All @@ -94,7 +94,7 @@ func newZetoDomain(t *testing.T, config *zetotypes.DomainFactoryConfig) (chan ze
waitForDomain <- domain
return domain
}),
RegistryAddress: tktypes.MustEthAddress(config.FactoryAddress),
RegistryAddress: factoryAddress,
AllowSigning: true,
}
return waitForDomain, tbd
Expand Down
2 changes: 1 addition & 1 deletion domains/noto/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.5
require (
github.com/go-resty/resty/v2 v2.14.0
github.com/hyperledger/firefly-common v1.4.11
github.com/hyperledger/firefly-signer v1.1.18
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e
github.com/kaleido-io/paladin/core v0.0.0-00010101000000-000000000000
github.com/kaleido-io/paladin/toolkit v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion domains/noto/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hyperledger/firefly-common v1.4.11 h1:WKv2hQuNpS7yP51THxzpzrqU3jkln23C9vq5iminzBk=
github.com/hyperledger/firefly-common v1.4.11/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
github.com/hyperledger/firefly-signer v1.1.18 h1:W3ED5LSUQOBa9OkWnkv9Sn8iJs6hJ1AU6RidUkgh0/A=
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e h1:iqIs0NPtE9h1Vy4WBm2dsS4XbBIdpZPMNprlwdmIC0U=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
Expand Down
4 changes: 2 additions & 2 deletions domains/zeto/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/go-resty/resty/v2 v2.14.0
github.com/hyperledger-labs/zeto/go-sdk v0.0.0-20241004174307-aa3c1fdf0966
github.com/hyperledger/firefly-common v1.4.11
github.com/hyperledger/firefly-signer v1.1.18
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e
github.com/iden3/go-iden3-crypto v0.0.17
github.com/iden3/go-rapidsnark/prover v0.0.12
github.com/iden3/go-rapidsnark/types v0.0.3
Expand All @@ -18,6 +18,7 @@ require (
github.com/stretchr/testify v1.9.0
golang.org/x/text v0.19.0
google.golang.org/protobuf v1.35.1
gopkg.in/yaml.v2 v2.4.0
)

require (
Expand Down Expand Up @@ -103,7 +104,6 @@ require (
google.golang.org/grpc v1.67.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/postgres v1.5.9 // indirect
gorm.io/driver/sqlite v1.5.6 // indirect
Expand Down
2 changes: 1 addition & 1 deletion domains/zeto/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ github.com/hyperledger-labs/zeto/go-sdk v0.0.0-20241004174307-aa3c1fdf0966 h1:J5
github.com/hyperledger-labs/zeto/go-sdk v0.0.0-20241004174307-aa3c1fdf0966/go.mod h1:WyUa1UIizlcBQnTEMK5tWWskFz2glSTm7S6HaJTarps=
github.com/hyperledger/firefly-common v1.4.11 h1:WKv2hQuNpS7yP51THxzpzrqU3jkln23C9vq5iminzBk=
github.com/hyperledger/firefly-common v1.4.11/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
github.com/hyperledger/firefly-signer v1.1.18 h1:W3ED5LSUQOBa9OkWnkv9Sn8iJs6hJ1AU6RidUkgh0/A=
github.com/hyperledger/firefly-signer v1.1.19-0.20241027192206-656dd986267e h1:iqIs0NPtE9h1Vy4WBm2dsS4XbBIdpZPMNprlwdmIC0U=
github.com/iden3/go-iden3-crypto v0.0.17 h1:NdkceRLJo/pI4UpcjVah4lN/a3yzxRUGXqxbWcYh9mY=
github.com/iden3/go-iden3-crypto v0.0.17/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
github.com/iden3/go-rapidsnark/prover v0.0.12 h1:IOqZrK+0J91zU7goB74qAzdwPg1ZRpZvsGjgpz4c+MQ=
Expand Down
6 changes: 3 additions & 3 deletions domains/zeto/integration-test/contracts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
)

type ZetoDomainContracts struct {
factoryAddress *tktypes.EthAddress
FactoryAddress *tktypes.EthAddress
factoryAbi abi.ABI
deployedContracts map[string]*tktypes.EthAddress
deployedContractAbis map[string]abi.ABI
Expand Down Expand Up @@ -76,7 +76,7 @@ func deployDomainContracts(ctx context.Context, rpc rpcbackend.Backend, deployer
log.L(ctx).Infof("Deployed factory contract to %s", factoryAddr.String())

ctrs := newZetoDomainContracts()
ctrs.factoryAddress = factoryAddr
ctrs.FactoryAddress = factoryAddr
ctrs.deployedContracts = deployedContracts
ctrs.deployedContractAbis = deployedContractAbis
ctrs.cloneableContracts = cloneableContracts
Expand Down Expand Up @@ -152,7 +152,7 @@ func configureFactoryContract(ctx context.Context, tb testbed.Testbed, deployer

// Send the transaction
for contractName := range domainContracts.cloneableContracts {
err := registerImpl(ctx, contractName, domainContracts, abiFunc, deployer, domainContracts.factoryAddress, tb)
err := registerImpl(ctx, contractName, domainContracts, abiFunc, deployer, domainContracts.FactoryAddress, tb)
if err != nil {
return err
}
Expand Down
9 changes: 4 additions & 5 deletions domains/zeto/integration-test/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (s *zetoDomainTestSuite) SetupSuite() {
domainName := "zeto_" + tktypes.RandHex(8)
log.L(ctx).Infof("Domain name = %s", domainName)
config := PrepareZetoConfig(s.T(), s.deployedContracts, "../zkp")
zeto, zetoTestbed := newZetoDomain(s.T(), config)
zeto, zetoTestbed := newZetoDomain(s.T(), domainContracts, config)
done, _, rpc := newTestbed(s.T(), s.hdWalletSeed, map[string]*testbed.TestbedDomain{
domainName: zetoTestbed,
})
Expand Down Expand Up @@ -109,8 +109,7 @@ func (s *zetoDomainTestSuite) testZetoFungible(t *testing.T, tokenName string, u
s.setupContractsAbi(t, ctx, tokenName)
var zetoAddress tktypes.EthAddress
rpcerr := s.rpc.CallRPC(ctx, &zetoAddress, "testbed_deploy",
s.domainName, "me", &types.InitializerParams{
From: controllerName,
s.domainName, controllerName, &types.InitializerParams{
TokenName: tokenName,
})
if rpcerr != nil {
Expand Down Expand Up @@ -261,15 +260,15 @@ func mapConfig(t *testing.T, config *types.DomainFactoryConfig) (m map[string]an
return m
}

func newZetoDomain(t *testing.T, config *types.DomainFactoryConfig) (zeto.Zeto, *testbed.TestbedDomain) {
func newZetoDomain(t *testing.T, domainContracts *ZetoDomainContracts, config *types.DomainFactoryConfig) (zeto.Zeto, *testbed.TestbedDomain) {
var domain internalZeto.Zeto
return &domain, &testbed.TestbedDomain{
Config: mapConfig(t, config),
Plugin: plugintk.NewDomain(func(callbacks plugintk.DomainCallbacks) plugintk.DomainAPI {
domain.Callbacks = callbacks
return &domain
}),
RegistryAddress: tktypes.MustEthAddress(config.FactoryAddress),
RegistryAddress: tktypes.MustEthAddress(domainContracts.FactoryAddress.String()),
AllowSigning: true,
}
}
Expand Down
Loading
Loading