From bdb1a71e5234ba73ac58cacb1fb57e0acbf31d96 Mon Sep 17 00:00:00 2001 From: Andrew Richardson Date: Tue, 7 Jun 2022 10:47:27 -0400 Subject: [PATCH 1/2] Set FireFly contract back to "network version 1" Since "network version 2" is still actively being defined, best to keep the default contract in main pointed at version 1, until the full migration path has been defined and tested. Signed-off-by: Andrew Richardson --- smart_contracts/ethereum/solidity_firefly/contracts/Firefly.sol | 2 +- smart_contracts/fabric/firefly-go/chaincode/contract.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smart_contracts/ethereum/solidity_firefly/contracts/Firefly.sol b/smart_contracts/ethereum/solidity_firefly/contracts/Firefly.sol index b993a20e7..29a7e92df 100644 --- a/smart_contracts/ethereum/solidity_firefly/contracts/Firefly.sol +++ b/smart_contracts/ethereum/solidity_firefly/contracts/Firefly.sol @@ -19,6 +19,6 @@ contract Firefly { } function networkVersion() public pure returns (uint8) { - return 2; + return 1; } } diff --git a/smart_contracts/fabric/firefly-go/chaincode/contract.go b/smart_contracts/fabric/firefly-go/chaincode/contract.go index 529ffaf76..e276196ad 100644 --- a/smart_contracts/fabric/firefly-go/chaincode/contract.go +++ b/smart_contracts/fabric/firefly-go/chaincode/contract.go @@ -60,5 +60,5 @@ func (s *SmartContract) PinBatch(ctx contractapi.TransactionContextInterface, na } func (s *SmartContract) NetworkVersion() int { - return 2 + return 1 } From 5de6c350ef00b23960ca8e11782db16e7ddc7cef Mon Sep 17 00:00:00 2001 From: Andrew Richardson Date: Tue, 7 Jun 2022 10:48:56 -0400 Subject: [PATCH 2/2] Update UI to v1.1.0-alpha.1 Signed-off-by: Andrew Richardson --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 95c3d3163..ff98759a3 100644 --- a/manifest.json +++ b/manifest.json @@ -40,8 +40,8 @@ } }, "ui": { - "tag": "v1.0.1", - "release": "v1.0.1" + "tag": "v1.1.0-alpha.1", + "release": "v1.1.0-alpha.1" }, "cli": { "tag": "v1.0.2"