From cee549edec43eef23447fa096e8913d85fd3f2a1 Mon Sep 17 00:00:00 2001 From: linqili Date: Sat, 4 Apr 2020 02:06:12 +0800 Subject: [PATCH] modify digibank/magnetocorp application-java to fit fabric-gateway-java:2.0.0 and fabric-chaincode-java:2.0.0 Signed-off-by: linqili --- .../digibank/application-java/.classpath | 20 -- .../dependency-reduced-pom.xml | 61 ----- .../digibank/application-java/pom.xml | 160 ++++++----- .../src/org/digibank/AddToWallet.java | 56 ++-- .../src/org/digibank/Buy.java | 80 +++--- .../src/org/digibank/Redeem.java | 81 +++--- .../src/org/papernet/CommercialPaper.java | 258 +++++++++--------- .../src/org/papernet/ledgerapi/State.java | 72 ++--- .../magnetocorp/application-java/pom.xml | 157 +++++------ .../src/org/magnetocorp/AddToWallet.java | 4 +- .../src/org/magnetocorp/Issue.java | 2 +- .../src/org/papernet/CommercialPaper.java | 258 +++++++++--------- .../src/org/papernet/ledgerapi/State.java | 72 ++--- 13 files changed, 612 insertions(+), 669 deletions(-) delete mode 100644 commercial-paper/organization/digibank/application-java/.classpath delete mode 100644 commercial-paper/organization/digibank/application-java/dependency-reduced-pom.xml diff --git a/commercial-paper/organization/digibank/application-java/.classpath b/commercial-paper/organization/digibank/application-java/.classpath deleted file mode 100644 index 149cb3c9..00000000 --- a/commercial-paper/organization/digibank/application-java/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/commercial-paper/organization/digibank/application-java/dependency-reduced-pom.xml b/commercial-paper/organization/digibank/application-java/dependency-reduced-pom.xml deleted file mode 100644 index 7ff0d0cc..00000000 --- a/commercial-paper/organization/digibank/application-java/dependency-reduced-pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - commercial-paper - commercial-paper - 0.0.1-SNAPSHOT - - src - - - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - maven-shade-plugin - 3.2.0 - - - package - - shade - - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - hyperledger - Hyperledger Artifactory - https://hyperledger.jfrog.io/hyperledger/fabric-maven - - - jitpack.io - https://jitpack.io - - - - 1.4.2 - UTF-8 - 1.8 - UTF-8 - - diff --git a/commercial-paper/organization/digibank/application-java/pom.xml b/commercial-paper/organization/digibank/application-java/pom.xml index f3963d3f..b6658e53 100644 --- a/commercial-paper/organization/digibank/application-java/pom.xml +++ b/commercial-paper/organization/digibank/application-java/pom.xml @@ -1,99 +1,95 @@ - 4.0.0 - commercial-paper - commercial-paper - 0.0.1-SNAPSHOT + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + commercial-paper + commercial-paper + 0.0.1-SNAPSHOT - + - - 1.8 - UTF-8 - UTF-8 + + 1.8 + UTF-8 + UTF-8 - - [2.0.0,2.1) + + [2.0.0,2.1) + 2.0.0 - + - - src - - - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - + + src + + + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-shade-plugin - 3.2.0 - - - - package - - shade - - - - - - - *:* - + + org.apache.maven.plugins + maven-shade-plugin + 3.2.0 + + + + package + + shade + + + + + false + + + *:* + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA - - - - - + + + + + - - + + - - - hyperledger - Hyperledger Nexus - https://hyperledger.jfrog.io/hyperledger/fabric-maven - + + + jitpack.io + https://jitpack.io + + - - jitpack.io - https://jitpack.io - - + + + org.hyperledger.fabric + fabric-gateway-java + ${fabric-gateway-java.version} + - - - org.hyperledger.fabric-gateway-java - fabric-gateway-java - 2.0.0-SNAPSHOT - + + + org.hyperledger.fabric-chaincode-java + fabric-chaincode-shim + ${fabric-chaincode-java.version} + compile + - - - org.hyperledger.fabric-chaincode-java - fabric-chaincode-shim - ${fabric-chaincode-java.version} - compile - + + + org.json + json + 20180813 + - - - org.json - json - 20180813 - - - + diff --git a/commercial-paper/organization/digibank/application-java/src/org/digibank/AddToWallet.java b/commercial-paper/organization/digibank/application-java/src/org/digibank/AddToWallet.java index 01ace5aa..25982663 100644 --- a/commercial-paper/organization/digibank/application-java/src/org/digibank/AddToWallet.java +++ b/commercial-paper/organization/digibank/application-java/src/org/digibank/AddToWallet.java @@ -5,37 +5,61 @@ SPDX-License-Identifier: Apache-2.0 package org.digibank; import java.io.IOException; +import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; - -import org.hyperledger.fabric.gateway.GatewayException; +import java.security.InvalidKeyException; +import java.security.PrivateKey; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import org.hyperledger.fabric.gateway.Identities; +import org.hyperledger.fabric.gateway.Identity; import org.hyperledger.fabric.gateway.Wallet; -import org.hyperledger.fabric.gateway.Wallet.Identity; +import org.hyperledger.fabric.gateway.Wallets; public class AddToWallet { + private static X509Certificate readX509Certificate(final Path certificatePath) throws IOException, CertificateException { + try (Reader certificateReader = Files.newBufferedReader(certificatePath, StandardCharsets.UTF_8)) { + return Identities.readX509Certificate(certificateReader); + } + } + + private static PrivateKey getPrivateKey(final Path privateKeyPath) throws IOException, InvalidKeyException { + try (Reader privateKeyReader = Files.newBufferedReader(privateKeyPath, StandardCharsets.UTF_8)) { + return Identities.readPrivateKey(privateKeyReader); + } + } + public static void main(String[] args) { try { // A wallet stores a collection of identities - Path walletPath = Paths.get("..", "identity", "user", "balaji", "wallet"); - Wallet wallet = Wallet.createFileSystemWallet(walletPath); + Path walletPath = Paths.get(".", "wallet"); + Wallet wallet = Wallets.newFileSystemWallet(walletPath); - // Location of credentials to be stored in the wallet - Path credentialPath = Paths.get("..", "..", "..", "..","basic-network", "crypto-config", - "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp"); - Path certificatePem = credentialPath.resolve(Paths.get("signcerts", - "Admin@org1.example.com-cert.pem")); - Path privateKey = credentialPath.resolve(Paths.get("keystore", - "cd96d5260ad4757551ed4a5a991e62130f8008a0bf996e4e4b84cd097a747fec_sk")); + Path credentialPath = Paths.get("..", "..", "..",".." ,"test-network", "organizations", + "peerOrganizations", "org1.example.com", "users", "User1@org1.example.com", "msp"); + System.out.println("credentialPath: " + credentialPath.toString()); + Path certificatePath = credentialPath.resolve(Paths.get("signcerts", + "User1@org1.example.com-cert.pem")); + System.out.println("certificatePem: " + certificatePath.toString()); + Path privateKeyPath = credentialPath.resolve(Paths.get("keystore", + "priv_sk")); - // Load credentials into wallet - String identityLabel = "Admin@org1.example.com"; - Identity identity = Identity.createIdentity("Org1MSP", Files.newBufferedReader(certificatePem), Files.newBufferedReader(privateKey)); + X509Certificate certificate = readX509Certificate(certificatePath); + PrivateKey privateKey = getPrivateKey(privateKeyPath); + Identity identity = Identities.newX509Identity("Org1MSP", certificate, privateKey); + + + String identityLabel = "User1@org1.example.com"; wallet.put(identityLabel, identity); - } catch (IOException e) { + System.out.println("Write wallet info into " + walletPath.toString() + " successfully."); + + } catch (IOException | CertificateException | InvalidKeyException e) { System.err.println("Error adding to wallet"); e.printStackTrace(); } diff --git a/commercial-paper/organization/digibank/application-java/src/org/digibank/Buy.java b/commercial-paper/organization/digibank/application-java/src/org/digibank/Buy.java index 9e3710ed..35c224a9 100644 --- a/commercial-paper/organization/digibank/application-java/src/org/digibank/Buy.java +++ b/commercial-paper/organization/digibank/application-java/src/org/digibank/Buy.java @@ -15,58 +15,60 @@ import org.hyperledger.fabric.gateway.Gateway; import org.hyperledger.fabric.gateway.GatewayException; import org.hyperledger.fabric.gateway.Network; import org.hyperledger.fabric.gateway.Wallet; +import org.hyperledger.fabric.gateway.Wallets; import org.papernet.CommercialPaper; public class Buy { - private static final String ENVKEY="CONTRACT_NAME"; - - public static void main(String[] args) { - Gateway.Builder builder = Gateway.createBuilder(); + private static final String ENVKEY="CONTRACT_NAME"; - String contractName="papercontract"; - // get the name of the contract, in case it is overridden - Map envvar = System.getenv(); - if (envvar.containsKey(ENVKEY)){ - contractName=envvar.get(ENVKEY); - } + public static void main(String[] args) { + Gateway.Builder builder = Gateway.createBuilder(); - try { - // A wallet stores a collection of identities - Path walletPath = Paths.get("..", "identity", "user", "balaji", "wallet"); - Wallet wallet = Wallet.createFileSystemWallet(walletPath); + String contractName="papercontract"; + // get the name of the contract, in case it is overridden + Map envvar = System.getenv(); + if (envvar.containsKey(ENVKEY)){ + contractName=envvar.get(ENVKEY); + } - String userName = "Admin@org1.example.com"; + try { + // A wallet stores a collection of identities + Path walletPath = Paths.get(".", "wallet"); + Wallet wallet = Wallets.newFileSystemWallet(walletPath); + System.out.println("Read wallet info from: " + walletPath); - Path connectionProfile = Paths.get("..", "gateway", "networkConnection.yaml"); + String userName = "User1@org1.example.com"; - // Set connection options on the gateway builder - builder.identity(wallet, userName).networkConfig(connectionProfile).discovery(false); + Path connectionProfile = Paths.get("..", "gateway", "connection-org1.yaml"); - // Connect to gateway using application specified parameters - try(Gateway gateway = builder.connect()) { + // Set connection options on the gateway builder + builder.identity(wallet, userName).networkConfig(connectionProfile).discovery(false); - // Access PaperNet network - System.out.println("Use network channel: mychannel."); - Network network = gateway.getNetwork("mychannel"); + // Connect to gateway using application specified parameters + try(Gateway gateway = builder.connect()) { - // Get addressability to commercial paper contract - System.out.println("Use org.papernet.commercialpaper smart contract."); - Contract contract = network.getContract(contractName, "org.papernet.commercialpaper"); + // Access PaperNet network + System.out.println("Use network channel: mychannel."); + Network network = gateway.getNetwork("mychannel"); - // Buy commercial paper - System.out.println("Submit commercial paper buy transaction."); - byte[] response = contract.submitTransaction("buy", "MagnetoCorp", "00001", "MagnetoCorp", "DigiBank", "4900000", "2020-05-31"); + // Get addressability to commercial paper contract + System.out.println("Use org.papernet.commercialpaper smart contract."); + Contract contract = network.getContract(contractName, "org.papernet.commercialpaper"); - // Process response - System.out.println("Process buy transaction response."); - CommercialPaper paper = CommercialPaper.deserialize(response); - System.out.println(paper); - } - } catch (GatewayException | IOException | TimeoutException | InterruptedException e) { - e.printStackTrace(); - System.exit(-1); - } - } + // Buy commercial paper + System.out.println("Submit commercial paper buy transaction."); + byte[] response = contract.submitTransaction("buy", "MagnetoCorp", "00001", "MagnetoCorp", "DigiBank", "4900000", "2020-05-31"); + + // Process response + System.out.println("Process buy transaction response."); + CommercialPaper paper = CommercialPaper.deserialize(response); + System.out.println(paper); + } + } catch (GatewayException | IOException | TimeoutException | InterruptedException e) { + e.printStackTrace(); + System.exit(-1); + } + } } diff --git a/commercial-paper/organization/digibank/application-java/src/org/digibank/Redeem.java b/commercial-paper/organization/digibank/application-java/src/org/digibank/Redeem.java index b60b04c5..5e8b0516 100644 --- a/commercial-paper/organization/digibank/application-java/src/org/digibank/Redeem.java +++ b/commercial-paper/organization/digibank/application-java/src/org/digibank/Redeem.java @@ -15,58 +15,59 @@ import org.hyperledger.fabric.gateway.Gateway; import org.hyperledger.fabric.gateway.GatewayException; import org.hyperledger.fabric.gateway.Network; import org.hyperledger.fabric.gateway.Wallet; +import org.hyperledger.fabric.gateway.Wallets; import org.papernet.CommercialPaper; public class Redeem { - private static final String ENVKEY="CONTRACT_NAME"; - - public static void main(String[] args) { - Gateway.Builder builder = Gateway.createBuilder(); - - String contractName="papercontract"; - // get the name of the contract, in case it is overridden - Map envvar = System.getenv(); - if (envvar.containsKey(ENVKEY)){ - contractName=envvar.get(ENVKEY); - } + private static final String ENVKEY="CONTRACT_NAME"; - try { - // A wallet stores a collection of identities - Path walletPath = Paths.get("..", "identity", "user", "balaji", "wallet"); - Wallet wallet = Wallet.createFileSystemWallet(walletPath); + public static void main(String[] args) { + Gateway.Builder builder = Gateway.createBuilder(); - String userName = "Admin@org1.example.com"; + String contractName="papercontract"; + // get the name of the contract, in case it is overridden + Map envvar = System.getenv(); + if (envvar.containsKey(ENVKEY)){ + contractName=envvar.get(ENVKEY); + } - Path connectionProfile = Paths.get("..", "gateway", "networkConnection.yaml"); + try { + // A wallet stores a collection of identities + Path walletPath = Paths.get(".", "wallet"); + Wallet wallet = Wallets.newFileSystemWallet(walletPath); - // Set connection options on the gateway builder - builder.identity(wallet, userName).networkConfig(connectionProfile).discovery(false); + String userName = "User1@org1.example.com"; - // Connect to gateway using application specified parameters - try(Gateway gateway = builder.connect()) { + Path connectionProfile = Paths.get("..", "gateway", "connection-org1.yaml"); - // Access PaperNet network - System.out.println("Use network channel: mychannel."); - Network network = gateway.getNetwork("mychannel"); + // Set connection options on the gateway builder + builder.identity(wallet, userName).networkConfig(connectionProfile).discovery(false); - // Get addressability to commercial paper contract - System.out.println("Use org.papernet.commercialpaper smart contract."); - Contract contract = network.getContract("papercontract", "org.papernet.commercialpaper"); + // Connect to gateway using application specified parameters + try(Gateway gateway = builder.connect()) { - // Redeem commercial paper - System.out.println("Submit commercial paper redeem transaction."); - byte[] response = contract.submitTransaction("redeem", "MagnetoCorp", "00001", "DigiBank", "2020-11-30"); + // Access PaperNet network + System.out.println("Use network channel: mychannel."); + Network network = gateway.getNetwork("mychannel"); - // Process response - System.out.println("Process redeem transaction response."); - CommercialPaper paper = CommercialPaper.deserialize(response); - System.out.println(paper); - } - } catch (GatewayException | IOException | TimeoutException | InterruptedException e) { - e.printStackTrace(); - System.exit(-1); - } - } + // Get addressability to commercial paper contract + System.out.println("Use org.papernet.commercialpaper smart contract."); + Contract contract = network.getContract("papercontract", "org.papernet.commercialpaper"); + + // Redeem commercial paper + System.out.println("Submit commercial paper redeem transaction."); + byte[] response = contract.submitTransaction("redeem", "MagnetoCorp", "00001", "DigiBank", "2020-11-30"); + + // Process response + System.out.println("Process redeem transaction response."); + CommercialPaper paper = CommercialPaper.deserialize(response); + System.out.println(paper); + } + } catch (GatewayException | IOException | TimeoutException | InterruptedException e) { + e.printStackTrace(); + System.exit(-1); + } + } } diff --git a/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java b/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java index dbb4e3f1..513d6cfd 100644 --- a/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java +++ b/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java @@ -14,168 +14,168 @@ import org.json.JSONPropertyIgnore; @DataType() public class CommercialPaper extends State { - // Enumerate commercial paper state values - public final static String ISSUED = "ISSUED"; - public final static String TRADING = "TRADING"; - public final static String REDEEMED = "REDEEMED"; + // Enumerate commercial paper state values + public final static String ISSUED = "ISSUED"; + public final static String TRADING = "TRADING"; + public final static String REDEEMED = "REDEEMED"; - @Property() - private String state=""; + @Property() + private String state=""; - public String getState() { - return state; - } + public String getState() { + return state; + } - public CommercialPaper setState(String state) { - this.state = state; - return this; - } + public CommercialPaper setState(String state) { + this.state = state; + return this; + } - @JSONPropertyIgnore() - public boolean isIssued() { - return this.state.equals(CommercialPaper.ISSUED); - } + @JSONPropertyIgnore() + public boolean isIssued() { + return this.state.equals(CommercialPaper.ISSUED); + } - @JSONPropertyIgnore() - public boolean isTrading() { - return this.state.equals(CommercialPaper.TRADING); - } + @JSONPropertyIgnore() + public boolean isTrading() { + return this.state.equals(CommercialPaper.TRADING); + } - @JSONPropertyIgnore() - public boolean isRedeemed() { - return this.state.equals(CommercialPaper.REDEEMED); - } + @JSONPropertyIgnore() + public boolean isRedeemed() { + return this.state.equals(CommercialPaper.REDEEMED); + } - public CommercialPaper setIssued() { - this.state = CommercialPaper.ISSUED; - return this; - } + public CommercialPaper setIssued() { + this.state = CommercialPaper.ISSUED; + return this; + } - public CommercialPaper setTrading() { - this.state = CommercialPaper.TRADING; - return this; - } + public CommercialPaper setTrading() { + this.state = CommercialPaper.TRADING; + return this; + } - public CommercialPaper setRedeemed() { - this.state = CommercialPaper.REDEEMED; - return this; - } + public CommercialPaper setRedeemed() { + this.state = CommercialPaper.REDEEMED; + return this; + } - @Property() - private String paperNumber; + @Property() + private String paperNumber; - @Property() - private String issuer; + @Property() + private String issuer; - @Property() - private String issueDateTime; + @Property() + private String issueDateTime; - @Property() - private int faceValue; + @Property() + private int faceValue; - @Property() - private String maturityDateTime; + @Property() + private String maturityDateTime; - @Property() - private String owner; + @Property() + private String owner; - public String getOwner() { - return owner; - } + public String getOwner() { + return owner; + } - public CommercialPaper setOwner(String owner) { - this.owner = owner; - return this; - } + public CommercialPaper setOwner(String owner) { + this.owner = owner; + return this; + } - public CommercialPaper() { - super(); - } + public CommercialPaper() { + super(); + } - public CommercialPaper setKey() { - this.key = State.makeKey(new String[] { this.paperNumber }); - return this; - } + public CommercialPaper setKey() { + this.key = State.makeKey(new String[] { this.paperNumber }); + return this; + } - public String getPaperNumber() { - return paperNumber; - } + public String getPaperNumber() { + return paperNumber; + } - public CommercialPaper setPaperNumber(String paperNumber) { - this.paperNumber = paperNumber; - return this; - } + public CommercialPaper setPaperNumber(String paperNumber) { + this.paperNumber = paperNumber; + return this; + } - public String getIssuer() { - return issuer; - } + public String getIssuer() { + return issuer; + } - public CommercialPaper setIssuer(String issuer) { - this.issuer = issuer; - return this; - } + public CommercialPaper setIssuer(String issuer) { + this.issuer = issuer; + return this; + } - public String getIssueDateTime() { - return issueDateTime; - } + public String getIssueDateTime() { + return issueDateTime; + } - public CommercialPaper setIssueDateTime(String issueDateTime) { - this.issueDateTime = issueDateTime; - return this; - } + public CommercialPaper setIssueDateTime(String issueDateTime) { + this.issueDateTime = issueDateTime; + return this; + } - public int getFaceValue() { - return faceValue; - } + public int getFaceValue() { + return faceValue; + } - public CommercialPaper setFaceValue(int faceValue) { - this.faceValue = faceValue; - return this; - } + public CommercialPaper setFaceValue(int faceValue) { + this.faceValue = faceValue; + return this; + } - public String getMaturityDateTime() { - return maturityDateTime; - } + public String getMaturityDateTime() { + return maturityDateTime; + } - public CommercialPaper setMaturityDateTime(String maturityDateTime) { - this.maturityDateTime = maturityDateTime; - return this; - } + public CommercialPaper setMaturityDateTime(String maturityDateTime) { + this.maturityDateTime = maturityDateTime; + return this; + } - @Override - public String toString() { - return "Paper::" + this.key + " " + this.getPaperNumber() + " " + getIssuer() + " " + getFaceValue(); - } + @Override + public String toString() { + return "Paper::" + this.key + " " + this.getPaperNumber() + " " + getIssuer() + " " + getFaceValue(); + } - /** - * Deserialize a state data to commercial paper - * - * @param {Buffer} data to form back into the object - */ - public static CommercialPaper deserialize(byte[] data) { - JSONObject json = new JSONObject(new String(data, UTF_8)); + /** + * Deserialize a state data to commercial paper + * + * @param {Buffer} data to form back into the object + */ + public static CommercialPaper deserialize(byte[] data) { + JSONObject json = new JSONObject(new String(data, UTF_8)); - String issuer = json.getString("issuer"); - String paperNumber = json.getString("paperNumber"); - String issueDateTime = json.getString("issueDateTime"); - String maturityDateTime = json.getString("maturityDateTime"); - String owner = json.getString("owner"); - int faceValue = json.getInt("faceValue"); - String state = json.getString("state"); - return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue,owner,state); - } + String issuer = json.getString("issuer"); + String paperNumber = json.getString("paperNumber"); + String issueDateTime = json.getString("issueDateTime"); + String maturityDateTime = json.getString("maturityDateTime"); + String owner = json.getString("owner"); + int faceValue = json.getInt("faceValue"); + String state = json.getString("state"); + return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue,owner,state); + } - public static byte[] serialize(CommercialPaper paper) { - return State.serialize(paper); - } + public static byte[] serialize(CommercialPaper paper) { + return State.serialize(paper); + } - /** - * Factory method to create a commercial paper object - */ - public static CommercialPaper createInstance(String issuer, String paperNumber, String issueDateTime, - String maturityDateTime, int faceValue, String owner, String state) { - return new CommercialPaper().setIssuer(issuer).setPaperNumber(paperNumber).setMaturityDateTime(maturityDateTime) - .setFaceValue(faceValue).setKey().setIssueDateTime(issueDateTime).setOwner(owner).setState(state); - } + /** + * Factory method to create a commercial paper object + */ + public static CommercialPaper createInstance(String issuer, String paperNumber, String issueDateTime, + String maturityDateTime, int faceValue, String owner, String state) { + return new CommercialPaper().setIssuer(issuer).setPaperNumber(paperNumber).setMaturityDateTime(maturityDateTime) + .setFaceValue(faceValue).setKey().setIssueDateTime(issueDateTime).setOwner(owner).setState(state); + } } diff --git a/commercial-paper/organization/digibank/application-java/src/org/papernet/ledgerapi/State.java b/commercial-paper/organization/digibank/application-java/src/org/papernet/ledgerapi/State.java index a32abc02..115ca9ae 100644 --- a/commercial-paper/organization/digibank/application-java/src/org/papernet/ledgerapi/State.java +++ b/commercial-paper/organization/digibank/application-java/src/org/papernet/ledgerapi/State.java @@ -13,48 +13,48 @@ import org.json.JSONObject; */ public class State { - protected String key; + protected String key; - /** - * @param {String|Object} class An identifiable class of the instance - * @param {keyParts[]} elements to pull together to make a key for the objects - */ - public State() { + /** + * @param {String|Object} class An identifiable class of the instance + * @param {keyParts[]} elements to pull together to make a key for the objects + */ + public State() { - } + } - String getKey() { - return this.key; - } + String getKey() { + return this.key; + } - public String[] getSplitKey() { - return State.splitKey(this.key); - } + public String[] getSplitKey() { + return State.splitKey(this.key); + } - /** - * Convert object to buffer containing JSON data serialization Typically used - * before putState()ledger API - * - * @param {Object} JSON object to serialize - * @return {buffer} buffer with the data to store - */ - public static byte[] serialize(Object object) { - String jsonStr = new JSONObject(object).toString(); - return jsonStr.getBytes(UTF_8); - } + /** + * Convert object to buffer containing JSON data serialization Typically used + * before putState()ledger API + * + * @param {Object} JSON object to serialize + * @return {buffer} buffer with the data to store + */ + public static byte[] serialize(Object object) { + String jsonStr = new JSONObject(object).toString(); + return jsonStr.getBytes(UTF_8); + } - /** - * Join the keyParts to make a unififed string - * - * @param (String[]) keyParts - */ - public static String makeKey(String[] keyParts) { - return String.join(":", keyParts); - } + /** + * Join the keyParts to make a unififed string + * + * @param (String[]) keyParts + */ + public static String makeKey(String[] keyParts) { + return String.join(":", keyParts); + } - public static String[] splitKey(String key) { - System.out.println("splitting key " + key + " " + java.util.Arrays.asList(key.split(":"))); - return key.split(":"); - } + public static String[] splitKey(String key) { + System.out.println("splitting key " + key + " " + java.util.Arrays.asList(key.split(":"))); + return key.split(":"); + } } diff --git a/commercial-paper/organization/magnetocorp/application-java/pom.xml b/commercial-paper/organization/magnetocorp/application-java/pom.xml index de2b447f..a226fa3a 100644 --- a/commercial-paper/organization/magnetocorp/application-java/pom.xml +++ b/commercial-paper/organization/magnetocorp/application-java/pom.xml @@ -1,95 +1,96 @@ - 4.0.0 - commercial-paper - commercial-paper - 0.0.1-SNAPSHOT + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + commercial-paper + commercial-paper + 0.0.1-SNAPSHOT - + - - 1.8 - UTF-8 - UTF-8 + + 1.8 + UTF-8 + UTF-8 - - 2.0.0 - - 2.0.0 + + 2.0.0 + + 2.0.0 - + - - src - - - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - + + src + + + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-shade-plugin - 3.2.0 - - - - package - - shade - - - - - - - *:* - + + org.apache.maven.plugins + maven-shade-plugin + 3.2.0 + + + + package + + shade + + + + + false + + + *:* + META-INF/*.SF META-INF/*.DSA META-INF/*.RSA - - - - - + + + + + - - + + - - - jitpack.io - https://jitpack.io - - + + + jitpack.io + https://jitpack.io + + - - - org.hyperledger.fabric - fabric-gateway-java - ${fabric-gateway-java.version} - + + + org.hyperledger.fabric + fabric-gateway-java + ${fabric-gateway-java.version} + - - - org.hyperledger.fabric-chaincode-java - fabric-chaincode-shim - ${fabric-chaincode-java.version} - compile - + + + org.hyperledger.fabric-chaincode-java + fabric-chaincode-shim + ${fabric-chaincode-java.version} + compile + - - - org.json - json - 20180813 - + + + org.json + json + 20180813 + - + diff --git a/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/AddToWallet.java b/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/AddToWallet.java index 2dfe70b4..36d0c1f4 100644 --- a/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/AddToWallet.java +++ b/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/AddToWallet.java @@ -46,7 +46,7 @@ public class AddToWallet { "User1@org2.example.com-cert.pem")); System.out.println("certificatePem: " + certificatePath.toString()); Path privateKeyPath = credentialPath.resolve(Paths.get("keystore", - "c7077781c776d90009b3f68a75b15109e1cb82ae5dbdcc0b79644ff47d280db8_sk")); + "priv_sk")); X509Certificate certificate = readX509Certificate(certificatePath); PrivateKey privateKey = getPrivateKey(privateKeyPath); @@ -57,7 +57,7 @@ public class AddToWallet { String identityLabel = "User1@org2.example.com"; wallet.put(identityLabel, identity); - System.out.println("成功写入钱包信息：" + walletPath.toString()); + System.out.println("Write wallet info into " + walletPath.toString() + " successfully."); } catch (IOException | CertificateException | InvalidKeyException e) { System.err.println("Error adding to wallet"); diff --git a/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/Issue.java b/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/Issue.java index 872d6866..cdc268ed 100644 --- a/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/Issue.java +++ b/commercial-paper/organization/magnetocorp/application-java/src/org/magnetocorp/Issue.java @@ -59,7 +59,7 @@ public class Issue { // Issue commercial paper System.out.println("Submit commercial paper issue transaction."); - byte[] response = contract.submitTransaction("issue", "MagnetoCorp", "00002", "2020-05-31", "2020-11-30", "5000000"); + byte[] response = contract.submitTransaction("issue", "MagnetoCorp", "00001", "2020-05-31", "2020-11-30", "5000000"); // Process response System.out.println("Process issue transaction response."); diff --git a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java index e909b494..44985d69 100644 --- a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java +++ b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java @@ -15,169 +15,169 @@ import org.papernet.ledgerapi.State; @DataType() public class CommercialPaper extends State { - // Enumerate commercial paper state values - public final static String ISSUED = "ISSUED"; - public final static String TRADING = "TRADING"; - public final static String REDEEMED = "REDEEMED"; + // Enumerate commercial paper state values + public final static String ISSUED = "ISSUED"; + public final static String TRADING = "TRADING"; + public final static String REDEEMED = "REDEEMED"; - @Property() - private String state=""; + @Property() + private String state=""; - public String getState() { - return state; - } + public String getState() { + return state; + } - public CommercialPaper setState(String state) { - this.state = state; - return this; - } + public CommercialPaper setState(String state) { + this.state = state; + return this; + } - @JSONPropertyIgnore() - public boolean isIssued() { - return this.state.equals(CommercialPaper.ISSUED); - } + @JSONPropertyIgnore() + public boolean isIssued() { + return this.state.equals(CommercialPaper.ISSUED); + } - @JSONPropertyIgnore() - public boolean isTrading() { - return this.state.equals(CommercialPaper.TRADING); - } + @JSONPropertyIgnore() + public boolean isTrading() { + return this.state.equals(CommercialPaper.TRADING); + } - @JSONPropertyIgnore() - public boolean isRedeemed() { - return this.state.equals(CommercialPaper.REDEEMED); - } + @JSONPropertyIgnore() + public boolean isRedeemed() { + return this.state.equals(CommercialPaper.REDEEMED); + } - public CommercialPaper setIssued() { - this.state = CommercialPaper.ISSUED; - return this; - } + public CommercialPaper setIssued() { + this.state = CommercialPaper.ISSUED; + return this; + } - public CommercialPaper setTrading() { - this.state = CommercialPaper.TRADING; - return this; - } + public CommercialPaper setTrading() { + this.state = CommercialPaper.TRADING; + return this; + } - public CommercialPaper setRedeemed() { - this.state = CommercialPaper.REDEEMED; - return this; - } + public CommercialPaper setRedeemed() { + this.state = CommercialPaper.REDEEMED; + return this; + } - @Property() - private String paperNumber; + @Property() + private String paperNumber; - @Property() - private String issuer; + @Property() + private String issuer; - @Property() - private String issueDateTime; + @Property() + private String issueDateTime; - @Property() - private int faceValue; + @Property() + private int faceValue; - @Property() - private String maturityDateTime; + @Property() + private String maturityDateTime; - @Property() - private String owner; + @Property() + private String owner; - public String getOwner() { - return owner; - } + public String getOwner() { + return owner; + } - public CommercialPaper setOwner(String owner) { - this.owner = owner; - return this; - } + public CommercialPaper setOwner(String owner) { + this.owner = owner; + return this; + } - public CommercialPaper() { - super(); - } + public CommercialPaper() { + super(); + } - public CommercialPaper setKey() { - this.key = State.makeKey(new String[] { this.paperNumber }); - return this; - } + public CommercialPaper setKey() { + this.key = State.makeKey(new String[] { this.paperNumber }); + return this; + } - public String getPaperNumber() { - return paperNumber; - } + public String getPaperNumber() { + return paperNumber; + } - public CommercialPaper setPaperNumber(String paperNumber) { - this.paperNumber = paperNumber; - return this; - } + public CommercialPaper setPaperNumber(String paperNumber) { + this.paperNumber = paperNumber; + return this; + } - public String getIssuer() { - return issuer; - } + public String getIssuer() { + return issuer; + } - public CommercialPaper setIssuer(String issuer) { - this.issuer = issuer; - return this; - } + public CommercialPaper setIssuer(String issuer) { + this.issuer = issuer; + return this; + } - public String getIssueDateTime() { - return issueDateTime; - } + public String getIssueDateTime() { + return issueDateTime; + } - public CommercialPaper setIssueDateTime(String issueDateTime) { - this.issueDateTime = issueDateTime; - return this; - } + public CommercialPaper setIssueDateTime(String issueDateTime) { + this.issueDateTime = issueDateTime; + return this; + } - public int getFaceValue() { - return faceValue; - } + public int getFaceValue() { + return faceValue; + } - public CommercialPaper setFaceValue(int faceValue) { - this.faceValue = faceValue; - return this; - } + public CommercialPaper setFaceValue(int faceValue) { + this.faceValue = faceValue; + return this; + } - public String getMaturityDateTime() { - return maturityDateTime; - } + public String getMaturityDateTime() { + return maturityDateTime; + } - public CommercialPaper setMaturityDateTime(String maturityDateTime) { - this.maturityDateTime = maturityDateTime; - return this; - } + public CommercialPaper setMaturityDateTime(String maturityDateTime) { + this.maturityDateTime = maturityDateTime; + return this; + } - @Override - public String toString() { - return "Paper::" + this.key + " " + this.getPaperNumber() + " " + getIssuer() + " " + getFaceValue(); - } + @Override + public String toString() { + return "Paper::" + this.key + " " + this.getPaperNumber() + " " + getIssuer() + " " + getFaceValue(); + } - /** - * Deserialize a state data to commercial paper - * - * @param {Buffer} data to form back into the object - */ - public static CommercialPaper deserialize(byte[] data) { - JSONObject json = new JSONObject(new String(data, UTF_8)); + /** + * Deserialize a state data to commercial paper + * + * @param {Buffer} data to form back into the object + */ + public static CommercialPaper deserialize(byte[] data) { + JSONObject json = new JSONObject(new String(data, UTF_8)); - String issuer = json.getString("issuer"); - String paperNumber = json.getString("paperNumber"); - String issueDateTime = json.getString("issueDateTime"); - String maturityDateTime = json.getString("maturityDateTime"); - String owner = json.getString("owner"); - int faceValue = json.getInt("faceValue"); - String state = json.getString("state"); - return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state); - } + String issuer = json.getString("issuer"); + String paperNumber = json.getString("paperNumber"); + String issueDateTime = json.getString("issueDateTime"); + String maturityDateTime = json.getString("maturityDateTime"); + String owner = json.getString("owner"); + int faceValue = json.getInt("faceValue"); + String state = json.getString("state"); + return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state); + } - public static byte[] serialize(CommercialPaper paper) { - return State.serialize(paper); - } + public static byte[] serialize(CommercialPaper paper) { + return State.serialize(paper); + } - /** - * Factory method to create a commercial paper object - */ - public static CommercialPaper createInstance(String issuer, String paperNumber, String issueDateTime, - String maturityDateTime, int faceValue, String owner, String state) { - return new CommercialPaper().setIssuer(issuer).setPaperNumber(paperNumber).setMaturityDateTime(maturityDateTime) - .setFaceValue(faceValue).setKey().setIssueDateTime(issueDateTime).setOwner(issuer).setState(state); - } + /** + * Factory method to create a commercial paper object + */ + public static CommercialPaper createInstance(String issuer, String paperNumber, String issueDateTime, + String maturityDateTime, int faceValue, String owner, String state) { + return new CommercialPaper().setIssuer(issuer).setPaperNumber(paperNumber).setMaturityDateTime(maturityDateTime) + .setFaceValue(faceValue).setKey().setIssueDateTime(issueDateTime).setOwner(issuer).setState(state); + } } diff --git a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/ledgerapi/State.java b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/ledgerapi/State.java index a32abc02..115ca9ae 100644 --- a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/ledgerapi/State.java +++ b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/ledgerapi/State.java @@ -13,48 +13,48 @@ import org.json.JSONObject; */ public class State { - protected String key; + protected String key; - /** - * @param {String|Object} class An identifiable class of the instance - * @param {keyParts[]} elements to pull together to make a key for the objects - */ - public State() { + /** + * @param {String|Object} class An identifiable class of the instance + * @param {keyParts[]} elements to pull together to make a key for the objects + */ + public State() { - } + } - String getKey() { - return this.key; - } + String getKey() { + return this.key; + } - public String[] getSplitKey() { - return State.splitKey(this.key); - } + public String[] getSplitKey() { + return State.splitKey(this.key); + } - /** - * Convert object to buffer containing JSON data serialization Typically used - * before putState()ledger API - * - * @param {Object} JSON object to serialize - * @return {buffer} buffer with the data to store - */ - public static byte[] serialize(Object object) { - String jsonStr = new JSONObject(object).toString(); - return jsonStr.getBytes(UTF_8); - } + /** + * Convert object to buffer containing JSON data serialization Typically used + * before putState()ledger API + * + * @param {Object} JSON object to serialize + * @return {buffer} buffer with the data to store + */ + public static byte[] serialize(Object object) { + String jsonStr = new JSONObject(object).toString(); + return jsonStr.getBytes(UTF_8); + } - /** - * Join the keyParts to make a unififed string - * - * @param (String[]) keyParts - */ - public static String makeKey(String[] keyParts) { - return String.join(":", keyParts); - } + /** + * Join the keyParts to make a unififed string + * + * @param (String[]) keyParts + */ + public static String makeKey(String[] keyParts) { + return String.join(":", keyParts); + } - public static String[] splitKey(String key) { - System.out.println("splitting key " + key + " " + java.util.Arrays.asList(key.split(":"))); - return key.split(":"); - } + public static String[] splitKey(String key) { + System.out.println("splitting key " + key + " " + java.util.Arrays.asList(key.split(":"))); + return key.split(":"); + } }