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.

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 weaver dependencies and repository links #457

Merged
merged 5 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/test_asset-exchange-besu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
java-version: '11'
distribution: 'adopt'

- name: Use Node.js 14.x
uses: actions/setup-node@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v4.0.2
with:
node-version: 14.x
node-version: 16.x

- name: Use Protoc 3.15
run: |
Expand Down Expand Up @@ -215,10 +215,10 @@ jobs:
java-version: '11'
distribution: 'adopt'

- name: Use Node.js 14.x
uses: actions/setup-node@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v4.0.2
with:
node-version: 14.x
node-version: 16.x

- name: Use Protoc 3.15
run: |
Expand Down
76 changes: 76 additions & 0 deletions .github/workflows/test_go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,82 @@ jobs:
- name: Test
run: go test -v ./...
working-directory: core/network/fabric-interop-cc/interfaces/asset-mgmt

build_test_libs_utils:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.1

- name: Set up Go
uses: actions/setup-go@v4.0.0
with:
go-version: '1.20.2'

- name: Vendor
run: make run-vendor
working-directory: core/network/fabric-interop-cc/libs/utils

- name: Build
run: go build -v ./...
working-directory: core/network/fabric-interop-cc/libs/utils

build_test_libs_assetexchange:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.1

- name: Set up Go
uses: actions/setup-go@v4.0.0
with:
go-version: '1.20.2'

- name: Vendor
run: make run-vendor
working-directory: core/network/fabric-interop-cc/libs/assetexchange

- name: Build
run: go build -v ./...
working-directory: core/network/fabric-interop-cc/libs/assetexchange

unit_test_sdk:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.1

- name: Set up Go
uses: actions/setup-go@v4.0.0
with:
go-version: '1.20.2'

- name: Vendor
run: make run-vendor
working-directory: sdks/fabric/go-sdk

- name: Build
run: make build
working-directory: sdks/fabric/go-sdk

- name: Test
run: make test
working-directory: sdks/fabric/go-sdk

build_test_cli:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.1

- name: Set up Go
uses: actions/setup-go@v4.0.0
with:
go-version: '1.20.2'

- name: Vendor
run: make run-vendor
working-directory: samples/fabric/go-cli

- name: Build
run: make build
working-directory: samples/fabric/go-cli

test_simplestate:
runs-on: ubuntu-latest
Expand Down
16 changes: 8 additions & 8 deletions common/protos-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ module github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go
go 1.20

require (
github.com/hyperledger/fabric-protos-go v0.3.0
google.golang.org/grpc v1.54.0
google.golang.org/protobuf v1.30.0
github.com/hyperledger/fabric-protos-go v0.3.3
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.34.1
)

require (
github.com/golang/protobuf v1.5.2 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
github.com/golang/protobuf v1.5.4 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
)
39 changes: 17 additions & 22 deletions common/protos-go/go.sum
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/hyperledger/fabric-protos-go v0.3.0 h1:MXxy44WTMENOh5TI8+PCK2x6pMj47Go2vFRKDHB2PZs=
github.com/hyperledger/fabric-protos-go v0.3.0/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys=
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w=
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/hyperledger/fabric-protos-go v0.3.3 h1:0nssqz8QWJNVNBVQz+IIfAd2j1ku7QPKFSM/1anKizI=
github.com/hyperledger/fabric-protos-go v0.3.3/go.mod h1:BPXse9gIOQwyAePQrwQVUcc44bTW4bB5V3tujuvyArk=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
2 changes: 1 addition & 1 deletion common/protos-java-kt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repositories {
mavenLocal()
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies/' }
maven { url 'https://jitpack.io' }
}

Expand Down
6 changes: 4 additions & 2 deletions core/drivers/corda-driver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {

repositories {
mavenCentral()
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -36,7 +36,9 @@ repositories {
mavenCentral()
mavenLocal()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-lib' }
if (file("$projectDir/./github.properties").exists()) {
def styler = 'black red green yellow blue magenta cyan white'
.split().toList().withIndex(30)
Expand Down
6 changes: 4 additions & 2 deletions core/network/corda-interop-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ buildscript {
mavenLocal()
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
}

dependencies {
Expand Down Expand Up @@ -61,7 +61,9 @@ allprojects {
mavenLocal()
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-lib' }
maven { url 'https://jitpack.io' }
if (github_url != "") {
println("Fetching Weaver packages from: $github_url")
Expand Down
4 changes: 3 additions & 1 deletion core/network/corda-interop-app/repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ repositories {
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://jitpack.io' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-lib' }
}
59 changes: 29 additions & 30 deletions core/network/fabric-interop-cc/contracts/interop/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,46 @@ module github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabr
go 1.20

require (
github.com/ethereum/go-ethereum v1.11.6
github.com/golang/protobuf v1.5.2
github.com/ethereum/go-ethereum v1.13.15
github.com/golang/protobuf v1.5.4
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.5.11
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20220522111555-ae96e46bf4a1
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.5.11
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9
github.com/hyperledger/fabric-contract-api-go v1.1.1
github.com/hyperledger/fabric-protos-go v0.3.0
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.8.0
golang.org/x/crypto v0.9.0
google.golang.org/protobuf v1.30.0
github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c
github.com/hyperledger/fabric-contract-api-go v1.2.2
github.com/hyperledger/fabric-protos-go v0.3.3
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.22.0
google.golang.org/protobuf v1.34.1
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.2 // indirect
github.com/go-openapi/spec v0.19.4 // indirect
github.com/go-openapi/swag v0.19.5 // indirect
github.com/gobuffalo/envy v1.7.0 // indirect
github.com/gobuffalo/packd v0.3.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/spec v0.20.9 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gobuffalo/envy v1.10.2 // indirect
github.com/gobuffalo/packd v1.0.2 // indirect
github.com/gobuffalo/packr v1.30.1 // indirect
github.com/holiman/uint256 v1.2.2 // indirect
github.com/joho/godotenv v1.3.0 // indirect
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
github.com/holiman/uint256 v1.2.4 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/grpc v1.54.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/grpc v1.63.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading