Skip to content
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
26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ go 1.16

require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/Masterminds/squirrel v1.5.1
github.com/Masterminds/squirrel v1.5.2
github.com/aidarkhanov/nanoid v1.0.8
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/docker/go-units v0.4.0
github.com/getkin/kin-openapi v0.84.0
github.com/getkin/kin-openapi v0.87.0
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-resty/resty/v2 v2.7.0
Expand All @@ -19,37 +18,38 @@ require (
github.com/gorilla/websocket v1.4.2
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/jarcoal/httpmock v1.0.8
github.com/jarcoal/httpmock v1.1.0
github.com/karlseguin/ccache v2.0.3+incompatible
github.com/karlseguin/expect v1.0.8 // indirect
github.com/lib/pq v1.10.4
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.11 // indirect
github.com/mattn/go-sqlite3 v1.14.9
github.com/mattn/go-sqlite3 v1.14.10
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/microcosm-cc/bluemonday v1.0.16
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/onsi/ginkgo v1.16.1 // indirect
github.com/onsi/gomega v1.11.0 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/qeesung/image2ascii v1.0.1
github.com/rs/cors v1.8.0
github.com/rs/cors v1.8.2
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.2.1
github.com/spf13/viper v1.9.0
github.com/spf13/afero v1.7.1 // indirect
github.com/spf13/cobra v1.3.0
github.com/spf13/viper v1.10.1
github.com/stretchr/testify v1.7.0
github.com/wayneashleyberry/terminal-dimensions v1.0.0 // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonschema v1.2.0
gitlab.com/msvechla/mux-prometheus v0.0.2
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8 // indirect
golang.org/x/net v0.0.0-20211116231205-47ca1ff31462 // indirect
golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7
gopkg.in/ini.v1 v1.64.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)
190 changes: 131 additions & 59 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
},
"fabconnect": {
"image": "ghcr.io/hyperledger/firefly-fabconnect",
"tag": "v0.9.3",
"sha": "c8156e31d56954f4c945518c49934ea519905f0a2275fc8d8a8d1e7694654a80"
"tag": "v0.9.4",
"sha": "296870914178827fd634b16210550d220d4f8e26d2b09ecad352874178d9a215"
},
"dataexchange-https": {
"image": "ghcr.io/hyperledger/firefly-dataexchange-https",
Expand Down
3 changes: 1 addition & 2 deletions smart_contracts/ethereum/solidity_firefly/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "@hyperledger/assettrail-contracts",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this name get changed?

"version": "0.0.1",
"dependencies": {
"@openzeppelin/contracts": "^3.2.0",
"truffle": "^5.1.61"
"truffle": "^5.4.26"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
},
compilers: {
solc: {
version: "^0.6.0", // Fetch exact version from solc-bin (default: truffle's version)
version: "^0.7.0", // Fetch exact version from solc-bin (default: truffle's version)
evmVersion: "constantinople"
}
}
Expand Down
144 changes: 0 additions & 144 deletions smart_contracts/ethereum/solidity_kat/contracts/AssetTrail.sol

This file was deleted.

9 changes: 0 additions & 9 deletions smart_contracts/ethereum/solidity_kat/contracts/Payment.sol

This file was deleted.

8 changes: 0 additions & 8 deletions smart_contracts/ethereum/solidity_kat/package.json

This file was deleted.

Loading