Fix OP_RETURN issue for registering Cash Account

pokkst · Nov 4, 2019 · df1b032 · df1b032
1 parent ceac674
commit df1b032
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/WalletTemplate-test.wallet b/WalletTemplate-test.wallet
diff --git a/core/pom.xml b/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>cash.bitcoinj</groupId>
         <artifactId>bitcoinj-parent</artifactId>
-        <version>0.15.2</version>
+        <version>0.15.3</version>
     </parent>
 
     <artifactId>bitcoinj-core</artifactId>

diff --git a/core/src/main/java/org/bitcoinj/wallet/SendRequest.java b/core/src/main/java/org/bitcoinj/wallet/SendRequest.java
@@ -239,10 +239,10 @@ public static SendRequest createCashAccount(NetworkParameters params, String des
         String hash160 = new String(Hex.encode(destination.getHash160()), StandardCharsets.UTF_8);
         req.tx = new Transaction(params);
         req.tx.addOutput(Coin.parseCoin("0.00001"), destination);
-        ScriptBuilder scriptBuilder = new ScriptBuilder().op(ScriptOpCodes.OP_RETURN);
-        scriptBuilder.addChunk(new ScriptChunk(ScriptOpCodes.OP_PUSHDATA1, Hex.decode("01010101")));
-        scriptBuilder.addChunk(new ScriptChunk(ScriptOpCodes.OP_PUSHDATA1, cashAccountName.getBytes()));
-        scriptBuilder.addChunk(new ScriptChunk(ScriptOpCodes.OP_PUSHDATA1, Hex.decode("01" + hash160)));
+        ScriptBuilder scriptBuilder = new ScriptBuilder().op(ScriptOpCodes.OP_RETURN)
+                .data(Hex.decode("01010101"))
+                .data(cashAccountName.getBytes())
+                .data(Hex.decode("01" + hash160));
         Script script = scriptBuilder.build();
         req.tx.addOutput(Coin.ZERO, script);
         return req;

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>cash.bitcoinj</groupId>
         <artifactId>bitcoinj-parent</artifactId>
-        <version>0.15.2</version>
+        <version>0.15.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>cash.bitcoinj</groupId>
   <artifactId>bitcoinj-parent</artifactId>
-  <version>0.15.2</version>
+  <version>0.15.3</version>
   <packaging>pom</packaging>
 
     <modules>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>cash.bitcoinj</groupId>
     <artifactId>bitcoinj-parent</artifactId>
-    <version>0.15.2</version>
+    <version>0.15.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/wallettemplate/pom.xml b/wallettemplate/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cash.bitcoinj</groupId>
         <artifactId>bitcoinj-parent</artifactId>
-        <version>0.15.2</version>
+        <version>0.15.3</version>
     </parent>
 
     <artifactId>wallettemplate</artifactId>