rchain-toolkit 3.0.0 use of deployId instead of prepareDepoy

fabcotech · May 13, 2022 · 34d2759 · 34d2759
1 parent e1210e0
commit 34d2759
Show file tree

Hide file tree

Showing 32 changed files with 217 additions and 269 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "test:ft": "node tests-ft/index",
     "test:nft": "node tests-nft/index",
     "test:credit": "node tests-credit/index",
-    "dappy:namesystem": "node cli deploy --fungible false --contract-id dappynamesystem && node cli create-purse --new-id 0 --quantity 100000000 && node cli update-purse-price --price n9drev,50000000 --purse-id 0",
+    "dappy:namesystem": "node cli deploy --fungible false --contract-id dappynamesystem && node cli create-purse --new-id 0 --quantity 100000000 && node cli update-purse-price --price prefixrev,50000000 --purse-id 0",
     "dappy:namesystemanddefaults": "npm run dappy:namesystem && node cli create-purse --purses-file name-purses.json"
   },
   "repository": {
@@ -27,7 +27,7 @@
   "devDependencies": {
     "blakejs": "^1.1.0",
     "dotenv": "6.2.0",
-    "@fabcotech/rchain-toolkit": "2.0.0",
+    "@fabcotech/rchain-toolkit": "3.0.0",
     "uuid": "3.4.0",
     "rollup": "1.26.0",
     "rollup-plugin-commonjs": "^10.1.0",

diff --git a/rholang/master.rho b/rholang/master.rho
@@ -1,5 +1,5 @@
 new 
-  basket,
+  deployId(`rho:rchain:deployId`),
 
   prefixCh,
   entryCh,
@@ -1996,7 +1996,7 @@ in {
   insertArbitrary!(bundle+{*entryCh}, *entryUriCh) |
 
   for (entryUri <- entryUriCh) {
-    basket!({
+    deployId!({
       "status": "completed",
       "registryUri": *entryUri
     }) |

diff --git a/rholang/op_create_purses.rho b/rholang/op_create_purses.rho
@@ -1,6 +1,6 @@
 /* example of creating 5 NFT purses (fungible=false contract) */
 
-new basket,
+new deployId(`rho:rchain:deployId`),
   itCh,
   idsCh,
   resultsCh,
@@ -18,7 +18,7 @@ in {
             for (@results <- resultsCh) {
               // OP_CREATE_PURSES_COMPLETED_BEGIN
               stdout!("completed, purses created, check results to see errors/successes") |
-              basket!({ "status": "completed", "results": results})
+              deployId!({ "status": "completed", "results": results})
               // OP_CREATE_PURSES_COMPLETED_END
             }
           }

diff --git a/rholang/op_credit.rho b/rholang/op_credit.rho
@@ -1,6 +1,6 @@
 
 new
-  basket,
+  deployId(`rho:rchain:deployId`),
   revVaultCh,
   boxCh,
 
@@ -82,7 +82,7 @@ in {
                                       (true, Nil) => {
                                         match "error: purchase failed but was able to refund ${balance} " %% { "balance": balance } ++ r {
                                           s => {
-                                            basket!({ "status": "failed", "message": s }) |
+                                            deployId!({ "status": "failed", "message": s }) |
                                             stdout!(s)
                                           }
                                         }
@@ -91,7 +91,7 @@ in {
                                         stdout!(result) |
                                         match "error: CRITICAL purchase failed and was NOT ABLE to refund ${balance} " %% { "balance": balance } ++ r {
                                           s => {
-                                            basket!({ "status": "failed", "message": s }) |
+                                            deployId!({ "status": "failed", "message": s }) |
                                             stdout!(s)
                                           }
                                         }
@@ -103,15 +103,15 @@ in {
                             }
                             _ => {
                               // OP_CREDIT_COMPLETED_BEGIN
-                              basket!({ "status": "completed" }) |
+                              deployId!({ "status": "completed" }) |
                               stdout!("completed, credit successful")
                               // OP_CREDIT_COMPLETED_END
                             }
                           }
                         }
                       }
                       _ => {
-                        basket!({ "status": "failed", "message": result }) |
+                        deployId!({ "status": "failed", "message": result }) |
                         stdout!(("failed", result))
                       }
                     }

diff --git a/rholang/op_delete_expired_purse.rho b/rholang/op_delete_expired_purse.rho
@@ -1,5 +1,5 @@
 new
-  basket,
+  deployId(`rho:rchain:deployId`),
   entryCh,
   returnCh,
   registryLookup(`rho:registry:lookup`),
@@ -11,13 +11,13 @@ in {
     for (@r <- returnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         _ => {
           // OP_PUBLIC_DELETE_EXPIRED_PURSE_COMPLETED_BEGIN
           stdout!("completed, expired purses deleted") |
-          basket!({ "status": "completed" })
+          deployId!({ "status": "completed" })
           // OP_PUBLIC_DELETE_EXPIRED_PURSE_COMPLETED_END
         }
       }

diff --git a/rholang/op_delete_purse.rho b/rholang/op_delete_purse.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   returnCh,
   stdout(`rho:io:stdout`),
   deployerId(`rho:rchain:deployerId`),
@@ -14,13 +14,13 @@ in {
     for (@r <- returnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         _ => {
           // OP_DELETE_PURSE_COMPLETED_BEGIN
           stdout!("completed, purse deleted") |
-          basket!({ "status": "completed" })
+          deployId!({ "status": "completed" })
           // OP_DELETE_PURSE_COMPLETED_END
         }
       }

diff --git a/rholang/op_deploy.rho b/rholang/op_deploy.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   masterEntryCh,
   registerContractReturnCh,
   boxCh,
@@ -14,13 +14,13 @@ in {
     for (@r <- registerContractReturnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         (true, p) => {
           @(*deployerId, "rchain-token-contract", "MASTER_REGISTRY_URI", p.get("contractId"))!(p.get("superKey")) |
           // OP_REGISTER_CONTRACT_COMPLETED_BEGIN
-          basket!({
+          deployId!({
             "status": "completed",
             "masterRegistryUri": "MASTER_REGISTRY_URI",
             "contractId": p.get("contractId"),

diff --git a/rholang/op_deploy_box.rho b/rholang/op_deploy_box.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   entryCh,
   registerBoxReturnCh,
   stdout(`rho:io:stdout`),
@@ -14,13 +14,13 @@ in {
       stdout!(r) |
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         (true, p) => {
           @(*deployerId, "rchain-token-box", "MASTER_REGISTRY_URI", p.get("boxId"))!(p.get("boxCh")) |
           // OP_PUBLIC_REGISTER_BOX_COMPLETED_BEGIN
-          basket!({ "status": "completed", "boxId": p.get("boxId") }) |
+          deployId!({ "status": "completed", "boxId": p.get("boxId") }) |
           stdout!("completed, box registered")
           // OP_PUBLIC_REGISTER_BOX_COMPLETED_END
         }

diff --git a/rholang/op_lock.rho b/rholang/op_lock.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   returnCh,
   stdout(`rho:io:stdout`),
   deployerId(`rho:rchain:deployerId`),
@@ -13,13 +13,13 @@ in {
     for (@r <- returnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         _ => {
           // OP_LOCK_COMPLETED_BEGIN
           stdout!("completed, contract locked") |
-          basket!({ "status": "completed" })
+          deployId!({ "status": "completed" })
           // OP_LOCK_COMPLETED_END
         }
       }

diff --git a/rholang/op_renew.rho b/rholang/op_renew.rho
@@ -1,9 +1,8 @@
 
 new
-  basket,
+  deployId(`rho:rchain:deployId`),
   boxCh,
   returnCh,
-
   deployerId(`rho:rchain:deployerId`),
   stdout(`rho:io:stdout`)
 in {
@@ -21,12 +20,12 @@ in {
     for (@r <- returnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         (true, Nil) => {
           // OP_RENEW_COMPLETED_BEGIN
-          basket!({ "status": "completed" }) |
+          deployId!({ "status": "completed" }) |
           stdout!("completed, renew successful")
           // OP_RENEW_COMPLETED_END
         }

diff --git a/rholang/op_swap.rho b/rholang/op_swap.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   returnCh,
   boxCh,
   stdout(`rho:io:stdout`),
@@ -12,12 +12,12 @@ in {
     for (@r <- returnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         (true, Nil) => {
           // OP_SWAP_BEGIN
-          basket!({ "status": "completed" }) |
+          deployId!({ "status": "completed" }) |
           stdout!("completed, swap successful")
           // OP_SWAP_END
         }

diff --git a/rholang/op_update_fee.rho b/rholang/op_update_fee.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   returnCh,
   stdout(`rho:io:stdout`),
   deployerId(`rho:rchain:deployerId`),
@@ -15,13 +15,13 @@ in {
       stdout!(r) |
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         _ => {
           // OP_UPDATE_FEE_COMPLETED_BEGIN
           stdout!("completed, fee updated") |
-          basket!({ "status": "completed" })
+          deployId!({ "status": "completed" })
           // OP_UPDATE_FEE_COMPLETED_END
         }
       }

diff --git a/rholang/op_update_purse_data.rho b/rholang/op_update_purse_data.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   returnCh,
   boxCh,
   stdout(`rho:io:stdout`),
@@ -11,12 +11,12 @@ in {
     for (@r <- returnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         _ => {
           // OP_UPDATE_PURSE_DATA_COMPLETED_BEGIN
-          basket!({ "status": "completed" }) |
+          deployId!({ "status": "completed" }) |
           stdout!("completed, data updated")
           // OP_UPDATE_PURSE_DATA_COMPLETED_END
         }

diff --git a/rholang/op_update_purse_price.rho b/rholang/op_update_purse_price.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   returnCh,
   boxCh,
   stdout(`rho:io:stdout`),
@@ -11,12 +11,12 @@ in {
     for (@r <- returnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         _ => {
           // OP_UPDATE_PURSE_PRICE_COMPLETED_BEGIN
-          basket!({ "status": "completed" }) |
+          deployId!({ "status": "completed" }) |
           stdout!("completed, price updated")
           // OP_UPDATE_PURSE_PRICE_COMPLETED_END
         }

diff --git a/rholang/op_withdraw.rho b/rholang/op_withdraw.rho
@@ -1,4 +1,4 @@
-new basket,
+new deployId(`rho:rchain:deployId`),
   withdrawReturnCh,
   boxCh,
   stdout(`rho:io:stdout`),
@@ -11,12 +11,12 @@ in {
     for (@r <- withdrawReturnCh) {
       match r {
         String => {
-          basket!({ "status": "failed", "message": r }) |
+          deployId!({ "status": "failed", "message": r }) |
           stdout!(("failed", r))
         }
         _ => {
           // OP_WITHDRAW_COMPLETED_BEGIN
-          basket!({ "status": "completed" }) |
+          deployId!({ "status": "completed" }) |
           stdout!("completed, withdraw successful")
           // OP_WITHDRAW_COMPLETED_END
         }

diff --git a/src/createPursesTerm.js b/src/createPursesTerm.js
@@ -18,12 +18,12 @@ module.exports.createPursesTerm = (payload) => {
     .map((p, i) => '@value' + i + ' <- channel' + i)
     .join('; ')}) {\n`;
   rholang += `  // OP_CREATE_PURSES_COMPLETED_BEGIN\n   stdout!("purses created, check results to see successes/failures") |
-  basket!({ "status": "completed", "results": {}${ids
+  deployId!({ "status": "completed", "results": {}${ids
     .map((p, i) => `.union({ "${p}": value${i} })`)
     .join('')}}) // OP_CREATE_PURSES_COMPLETED_END\n`;
   rholang += `}\n}`;
 
-  return `new basket, entryCh, readCh, stdout(\`rho:io:stdout\`), deployerId(\`rho:rchain:deployerId\`), lookup(\`rho:registry:lookup\`) in {
+  return `new deployId(\`rho:rchain:deployId\`), entryCh, readCh, stdout(\`rho:io:stdout\`), deployerId(\`rho:rchain:deployerId\`), lookup(\`rho:registry:lookup\`) in {
     for (superKey <<- @(*deployerId, "rchain-token-contract", "${payload.masterRegistryUri}", "${payload.contractId}")) {
       ${rholang}
     }

diff --git a/src/creditAndSwapTerm.js b/src/creditAndSwapTerm.js
@@ -13,7 +13,7 @@ module.exports.creditAndSwapTerm = (
 
   const term2 = term1.slice(0, indexStart) + term1.slice(indexEnd).replace(
     `// OP_CREDIT_COMPLETED_END`,
-    `${swapTerm(payloadSwap).replace('basket,', '')}`
+    `${swapTerm(payloadSwap).replace('deployId(`rho:rchain:deployId`),', '')}`
   );
 
   return term2;