rename to diem, regen code and fix tests (#61)

* rename to diem, regen code and fix tests
* update version to 1.0.0 for publish new version
* fix git submodule
* rename account identifier hrp

Author: Xiao Li

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "libra"]
-	path = libra
-	url = https://github.com/libra/libra.git
+[submodule "diem"]
+	path = diem
+	url = https://github.com/diem/diem.git

CHECKLIST.md

@@ -1,3 +1,3 @@
 # Code of Conduct
 
-The project has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://developers.libra.org/docs/policies/code-of-conduct) so that you can understand what actions will and will not be tolerated.
+The project has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://developers.diem.com/docs/policies/code-of-conduct) so that you can understand what actions will and will not be tolerated.

CODE_OF_CONDUCT.md

@@ -4,14 +4,14 @@ This project welcomes contributions.
 
 ## Contributor License Agreement
 
-For pull request to be accepted by any Libra projects, a CLA must be signed.
-You will only need to do this once to work on any of Libra's open source
+For pull request to be accepted by any Diem projects, a CLA must be signed.
+You will only need to do this once to work on any of Diem's open source
 projects.
 
-When submitting a PR, the libra-github-bot will check your comment for a valid CLA. If one is not found, then you will need to submit an Individual CLA for yourself or a Corporate CLA for your company.
+When submitting a PR, the diem-github-bot will check your comment for a valid CLA. If one is not found, then you will need to submit an Individual CLA for yourself or a Corporate CLA for your company.
 
 ## Issues
 
-client-sdk-java uses [GitHub issues](https://github.com/libra/client-sdk-java/issues) to track
+client-sdk-java uses [GitHub issues](https://github.com/diem/client-sdk-java/issues) to track
 bugs. Please include necessary information and instructions to reproduce your
 issue.

CONTRIBUTING.md

@@ -1,47 +1,44 @@
-> **Note to readers:** On December 1, 2020, the Libra Association was renamed to Diem Association. The project repos are in the process of being migrated. All projects will remain available for use here until the migration to a new GitHub Organization is complete.
-
 # client-sdk-java
 
-![Java CI with Gradle](https://github.com/libra/client-sdk-java/workflows/Java%20CI%20with%20Gradle/badge.svg) [![API Reference](https://img.shields.io/badge/api-reference-blue.svg)](https://github.com/libra/libra/blob/master/json-rpc/json-rpc-spec.md) [![Apache V2 License](https://img.shields.io/badge/license-Apache%20V2-blue.svg)](../master/LICENSE) [![javadoc](https://javadoc.io/badge2/org.libra/client-sdk-java/javadoc.svg)](https://javadoc.io/doc/org.libra/client-sdk-java)
+![Java CI with Gradle](https://github.com/diem/client-sdk-java/workflows/Java%20CI%20with%20Gradle/badge.svg) [![API Reference](https://img.shields.io/badge/api-reference-blue.svg)](https://github.com/diem/diem/blob/master/json-rpc/json-rpc-spec.md) [![Apache V2 License](https://img.shields.io/badge/license-Apache%20V2-blue.svg)](../master/LICENSE) [![javadoc](https://javadoc.io/badge2/org.diem/client-sdk-java/javadoc.svg)](https://javadoc.io/doc/org.diem/client-sdk-java)
 
-`client-sdk-java` is the official Libra Client SDK for the Java programming language.
+`client-sdk-java` is the official diem Client SDK for the Java programming language.
 
 ## Overview of SDK's Packages
 
-### [`org.libra`](./src/main/java/com/org/libra/)
+### [`com.diem`](./src/main/java/com/com/diem/)
 
 > SPEC = specification
-> LIP-X = Libra Improvement Protocol
+> LIP-X = Diem Improvement Protocol
 
-- `jsonrpc`: libra JSON-RPC APIs client. [SPEC](https://github.com/libra/libra/blob/master/json-rpc/json-rpc-spec.md)
-- `jsonrpctypes`: generated code, JSON-RPC API response data object classes generated from protobuf definition.
+- `jsonrpc`: diem JSON-RPC APIs client. [SPEC](https://github.com/diem/diem/blob/master/json-rpc/json-rpc-spec.md)
 - `stdlib`: generated code, move stdlib script utils for constructing transaction script playload.
-- `types`: generated code, Libra on-chain data structure types. Mostly generated code with small extension code for attaching handy functions to generated types.
+- `types`: generated code, diem on-chain data structure types. Mostly generated code with small extension code for attaching handy functions to generated types.
 - `utils`: utility functions, account address utils, currency code, hashing, hex encoding / decoding, transaction utils.
-- `AccountIdentifier` & `IntentIdentifier`: encoding & decoding Libra Account Identifier and Intent URL. [LIP-5](https://lip.libra.org/lip-5/)
-- `LibraClient`: interface of JSON-RPC client.
-- `LibraException`: root exception of all checked exceptions defined in SDK.
+- `AccountIdentifier` & `IntentIdentifier`: encoding & decoding diem Account Identifier and Intent URL. [LIP-5](https://dip.diem.com/dip-5/)
+- `DiemClient`: interface of JSON-RPC client.
+- `DiemException`: root exception of all checked exceptions defined in SDK.
 - `PrivateKey`: abstraction for hiding private key details, implement this interface for plugin your customized private key signing logic.
 - `Signer`: sign transaction logic.
 - `Testnet`: Testnet utility, minting coins, create Testnet client, chain id, Testnet JSON-RPC URL.
-- `TransactionMetadata`: utils for creating peer to peer transaction metadata. [LIP-4](https://lip.libra.org/lip-4/)
+- `TransactionMetadata`: utils for creating peer to peer transaction metadata. [LIP-4](https://dip.diem.com/dip-4/)
 - `Constants`: static data and JSON-RPC response enum type values.
 
 ## Examples
 
-You can find all of the example code under the [`src/test/java/org/libra/examples`](./src/test/java/org/libra/examples/) directory:
+You can find all of the example code under the [`src/test/java/com/diem/examples`](./src/test/java/com/diem/examples/) directory:
 
-* [Create Child VASP Account](./src/test/java/org/libra/examples/CreateChildVASP.java)
-* [All Types Peer To Peer Transfer](./src/test/java/org/libra/examples/PeerToPeerTransfer.java)
-* [Intent Identifier](./src/test/java/org/libra/examples/IntentId.java)
-* [Refund](./src/test/java/org/libra/examples/Refund.java)
+* [Create Child VASP Account](./src/test/java/com/diem/examples/CreateChildVASP.java)
+* [All Types Peer To Peer Transfer](./src/test/java/com/diem/examples/PeerToPeerTransfer.java)
+* [Intent Identifier](./src/test/java/com/diem/examples/IntentId.java)
+* [Refund](./src/test/java/com/diem/examples/Refund.java)
 
 ## Download
 
 **Gradle**
 
 ```gradle
-implementation 'org.libra:libra-client-sdk-java:0.1.0'
+implementation 'com.diem:client-sdk-java:1.0.0'
 ```
 
 **Maven**
@@ -50,7 +47,7 @@ implementation 'org.libra:libra-client-sdk-java:0.1.0'
 <dependency>
   <groupId>com.diem</groupId>
   <artifactId>client-sdk-java</artifactId>
-  <version>0.1.0</version>
+  <version>1.0.0</version>
 </dependency>
 ```
 [Download Jars on Maven](https://repo1.maven.org/maven2/com/diem/client-sdk-java/)
@@ -76,10 +73,10 @@ Jar file location: build/libs/client-sdk-java.jar
 gradle test
 ```
 
-## Upgrade to latest libra testnet release
+## Upgrade to latest diem testnet release
 
 ```
-// reset libra submodule to testnet branch, re-generate stdlib and lcs type classes
+// reset diem submodule to testnet branch, re-generate stdlib and lcs type classes
 gradle gen
 
 // generate jsonrpc types from protobuf definition
@@ -98,6 +95,3 @@ gradle test
 
 [CONTRIBUTING](./CONTRIBUTING.md)
 
-# Features, Roadmap and Development Plan
-
-[CHECKLIST](./CHECKLIST.md)

README.md

@@ -1,5 +1,5 @@
 # Security Policies and Procedures
 
-Please see Libra's
-[security policies](https://developers.libra.org/docs/policies/security) and
+Please see Diem's
+[security policies](https://developers.diem.com/docs/policies/security) and
 procedures for reporting vulnerabilities.

SECURITY.md

@@ -11,7 +11,7 @@ repositories {
 }
 
 group 'com.diem'
-version '0.1.0'
+version '1.0.0'
 
 apply plugin: 'java-library'
 apply plugin: 'java'
@@ -34,7 +34,7 @@ publishing {
             pom {
                 name = 'Diem Client SDK'
                 description = 'The official Diem Client SDK for the Java programming language.'
-                url = 'https://github.com/libra/client-sdk-java'
+                url = 'https://github.com/diem/client-sdk-java'
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'
@@ -44,12 +44,12 @@ publishing {
                 developers {
                     developer {
                         name = 'Diem Open Source'
-                        url = 'https://developers.diem.org'
+                        url = 'https://developers.diem.com'
                     }
                 }
                 scm {
-                    connection = 'scm:git:[email protected]:libra/client-sdk-java.git'
-                    url = 'https://github.com/libra/client-sdk-java'
+                    connection = 'scm:git:[email protected]:diem/client-sdk-java.git'
+                    url = 'https://github.com/diem/client-sdk-java'
                 }
             }
             tasks.withType(Jar) {
@@ -107,17 +107,17 @@ signing {
 task gen {
     doLast {
         exec {
-            workingDir 'libra'
+            workingDir 'diem'
             executable "sh"
             args "-c", "cargo build -p transaction-builder-generator"
         }
         exec {
-            workingDir 'libra'
+            workingDir 'diem'
             executable "sh"
             args '-c', 'target/debug/generate-transaction-builders' +
                     ' --language java' +
-                    ' --module-name org.libra.stdlib' +
-                    ' --with-libra-types "testsuite/generate-format/tests/staged/libra.yaml"' +
+                    ' --module-name com.diem.stdlib' +
+                    ' --with-diem-types "testsuite/generate-format/tests/staged/diem.yaml"' +
                     ' --target-source-dir "./../src/main/java"' +
                     ' "language/stdlib/compiled/transaction_scripts/abi"'
         }

build.gradle

@@ -1,23 +1,24 @@
-// Copyright (c) The Libra Core Contributors
+// Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-package org.diem;
+package com.diem;
 
+import com.diem.types.AccountAddress;
+import com.diem.utils.AccountAddressUtils;
 import com.google.common.primitives.Bytes;
 import org.apache.commons.lang3.ArrayUtils;
 import org.bitcoinj.core.Bech32;
-import org.diem.types.AccountAddress;
-import org.diem.utils.AccountAddressUtils;
 
 import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Objects;
 
-import static org.diem.SubAddress.SUB_ADDRESS_LENGTH;
+import static com.diem.SubAddress.SUB_ADDRESS_LENGTH;
 
 /**
- * AccountIdentifier implements Libra Account Identifier encoding and decoding.
- * @see <a href="https://github.com/libra/lip/blob/master/lips/lip-5.md">LIP-5 Address formatting</a>
+ * AccountIdentifier implements Diem Account Identifier encoding and decoding.
+ * @see <a href="https://github.com/diem/lip/blob/master/lips/lip-5.md">LIP-5 Address formatting</a>
  */
 public class AccountIdentifier {
 
@@ -53,7 +54,7 @@ public static AccountIdentifier decode(NetworkPrefix prefix, String encodedAccou
         byte[] subAddressChars = Arrays.copyOfRange(bytes, AccountAddressUtils.ACCOUNT_ADDRESS_LENGTH, AccountAddressUtils.ACCOUNT_ADDRESS_LENGTH + SUB_ADDRESS_LENGTH);
 
         Byte[] addressBytes = ArrayUtils.toObject(addressChars);
-        AccountAddress accountAddress = new AccountAddress(addressBytes);
+        AccountAddress accountAddress = new AccountAddress(Arrays.asList(addressBytes));
         SubAddress subAddress = new SubAddress(subAddressChars);
 
         return new AccountIdentifier(prefix, accountAddress, subAddress);
@@ -98,10 +99,10 @@ public static byte[] convertBits(final byte[] inputs, final int fromBits, final
     }
 
     /**
-     * NetworkPrefix is network prefix of a Libra Account Identifier.
+     * NetworkPrefix is network prefix of a Diem Account Identifier.
      */
     public enum NetworkPrefix {
-        MainnetPrefix("lbr"), TestnetPrefix("tlb");
+        MainnetPrefix("dm"), TestnetPrefix("tdm"), PreMainnetPrefix("pdm"), DryRunMainnetPrefix("ddm");
 
         private final String value;
 
@@ -175,8 +176,8 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         AccountIdentifier that = (AccountIdentifier) o;
         return prefix == that.prefix &&
-                Arrays.equals(accountAddress.value, that.accountAddress.value) &&
-                Arrays.equals(subAddress.getBytes(), that.subAddress.getBytes());
+                Objects.equals(accountAddress, that.accountAddress) &&
+                Objects.equals(subAddress, that.subAddress);
     }
 
     @Override

diem

@@ -1,13 +1,13 @@
-// Copyright (c) The Libra Core Contributors
+// Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-package org.diem;
+package com.diem;
 
+import com.diem.types.AccountAddress;
+import com.diem.utils.AccountAddressUtils;
 import com.novi.serde.Bytes;
-import org.diem.types.AccountAddress;
-import org.diem.utils.AccountAddressUtils;
-import org.diem.utils.HashUtils;
-import org.diem.utils.Hex;
+import com.diem.utils.HashUtils;
+import com.diem.utils.Hex;
 
 import java.util.Arrays;