Skip to content

Commit

Permalink
Merge pull request #3 from hyperledger-labs/main
Browse files Browse the repository at this point in the history
Update from Hyperledger-labs
  • Loading branch information
sanven8 authored May 6, 2021
2 parents 63c8213 + 52f694f commit fc8afe9
Show file tree
Hide file tree
Showing 14 changed files with 2,829 additions and 21 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,7 @@ For more details and illustrations, see the [project overview](./OVERVIEW.md).

## Sponsor
- https://github.com/lehors - TSC Member

# Former Members
- https://github.com/ChanderG
- https://github.com/dushyantbehl
46 changes: 46 additions & 0 deletions common/interop-protos/common/asset_locks.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
syntax = "proto3";

package common.asset_locks;
option go_package = "/common";

enum LockMechanism {
HTLC = 0;
}

message AssetLock {
LockMechanism lockMechanism = 1;
bytes lockInfo = 2;
}

message AssetClaim {
LockMechanism lockMechanism = 1;
bytes claimInfo = 2;
}

message AssetLockHTLC {
bytes hash = 1;
uint64 expiryTimeSecs = 2;
enum TimeSpec {
EPOCH = 0;
DURATION = 1;
}
TimeSpec timeSpec = 3;
}

message AssetClaimHTLC {
bytes hashPreimage = 1;
}

message AssetExchangeAgreement {
string type = 1;
string id = 2;
string locker = 3;
string recipient = 4;
}

message FungibleAssetExchangeAgreement {
string type = 1;
uint64 numUnits = 2;
string locker = 3;
string recipient = 4;
}
2 changes: 1 addition & 1 deletion core/network/fabric-interop-cc/contracts/interop/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/contracts/interop

go 1.14
go 1.16

require (
github.com/golang/protobuf v1.4.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
protos-go/
vendor/
interop
Loading

0 comments on commit fc8afe9

Please sign in to comment.