update docs and groom api

Signed-off-by: Valentyn Faychuk <valy@faychuk.com>

Author: valentynfaychuk

contract_samples/rust/README.md

@@ -41,8 +41,7 @@ ama get-pk --sk wallet.sk
 ama gen-sk counter.sk
 export COUNTER_PK=$(ama get-pk --sk counter.sk)
 ama tx --sk wallet.sk --url https://testnet-rpc.ama.one Coin transfer '[{"b58": "'$COUNTER_PK'"}, "2000000000", "AMA"]'
-ama deploy-tx --sk counter.sk counter.wasm --url https://testnet-rpc.ama.one
-ama tx --sk counter.sk --url https://testnet-rpc.ama.one $COUNTER_PK init '[]'
+ama deploy-tx --sk counter.sk counter.wasm init '[]' --url https://testnet-rpc.ama.one
 curl "https://testnet-rpc.ama.one/api/contract/view/$COUNTER_PK/get"
 ama tx --sk wallet.sk --url https://testnet-rpc.ama.one $COUNTER_PK increment '["5"]'
 curl "https://testnet-rpc.ama.one/api/contract/view/$COUNTER_PK/get"
@@ -58,7 +57,7 @@ ama tx --sk wallet.sk $DEPOSIT_PK balance '["AMA"]' --url https://testnet-rpc.am
 ama gen-sk coin.sk
 export COIN_PK=$(ama get-pk --sk coin.sk)
 ama tx --sk wallet.sk Coin transfer '[{"b58": "'$COIN_PK'"}, "2000000000", "AMA"]' --url https://testnet-rpc.ama.one
-ama deploy-tx --sk coin.sk coin.wasm --url https://testnet-rpc.ama.one
+ama deploy-tx --sk coin.sk coin.wasm init --url https://testnet-rpc.ama.one
 ama tx --sk wallet.sk $COIN_PK deposit '[]' AMA 1500000000 --url https://testnet-rpc.ama.one
 ama tx --sk wallet.sk $COIN_PK withdraw '["AMA", "500000000"]' --url https://testnet-rpc.ama.one
 ama tx --sk wallet.sk $COIN_PK withdraw '["AMA", "1000000000"]' --url https://testnet-rpc.ama.one

contract_samples/rust/build_and_validate.sh

@@ -1,17 +1,20 @@
 #!/bin/bash
 set -e
 
+script_dir=$(dirname "$0")
+cd "$script_dir"
+
 cargo build -p amadeus-sdk --example counter --target wasm32-unknown-unknown --release
 cargo build -p amadeus-sdk --example deposit --target wasm32-unknown-unknown --release
 cargo build -p amadeus-sdk --example coin --target wasm32-unknown-unknown --release
 cargo build -p amadeus-sdk --example nft --target wasm32-unknown-unknown --release
 
-wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/counter.wasm -o target/wasm32-unknown-unknown/release/examples/counter_opt.wasm
-wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/deposit.wasm -o target/wasm32-unknown-unknown/release/examples/deposit_opt.wasm
-wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/coin.wasm -o target/wasm32-unknown-unknown/release/examples/coin_opt.wasm
-wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/nft.wasm -o target/wasm32-unknown-unknown/release/examples/nft_opt.wasm
+wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/counter.wasm -o counter.wasm
+wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/deposit.wasm -o deposit.wasm
+wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/coin.wasm -o coin.wasm
+wasm-opt -Oz --enable-bulk-memory target/wasm32-unknown-unknown/release/examples/nft.wasm -o nft.wasm
 
-curl -X POST -H "Content-Type: application/octet-stream" --data-binary @target/wasm32-unknown-unknown/release/examples/counter_opt.wasm https://mainnet-rpc.ama.one/api/contract/validate
-curl -X POST -H "Content-Type: application/octet-stream" --data-binary @target/wasm32-unknown-unknown/release/examples/deposit_opt.wasm https://mainnet-rpc.ama.one/api/contract/validate
-curl -X POST -H "Content-Type: application/octet-stream" --data-binary @target/wasm32-unknown-unknown/release/examples/coin_opt.wasm https://mainnet-rpc.ama.one/api/contract/validate
-curl -X POST -H "Content-Type: application/octet-stream" --data-binary @target/wasm32-unknown-unknown/release/examples/nft_opt.wasm https://mainnet-rpc.ama.one/api/contract/validate
+curl -X POST -H "Content-Type: application/octet-stream" --data-binary @counter.wasm https://mainnet-rpc.ama.one/api/contract/validate
+curl -X POST -H "Content-Type: application/octet-stream" --data-binary @deposit.wasm https://mainnet-rpc.ama.one/api/contract/validate
+curl -X POST -H "Content-Type: application/octet-stream" --data-binary @coin.wasm https://mainnet-rpc.ama.one/api/contract/validate
+curl -X POST -H "Content-Type: application/octet-stream" --data-binary @nft.wasm https://mainnet-rpc.ama.one/api/contract/validate

ex/lib/api/api_tx.ex

@@ -173,8 +173,10 @@ defmodule API.TX do
         tx = put_in(tx, [:tx, :signer], Base58.encode(tx.tx.signer))
 
         action = TX.action(tx)
-        action = if !BlsEx.validate_public_key(action.contract) do action else
+        action = if is_binary(action.contract) and byte_size(action.contract) == 48 do
           Map.put(action, :contract, Base58.encode(action.contract))
+        else
+          action
         end
         args = Enum.map(action.args, fn(arg)->
             cond do
@@ -195,8 +197,6 @@ defmodule API.TX do
         logs = Enum.map(logs, fn(line)-> RocksDB.ascii_dump(line) end)
         receipt = %{success: success, result: result, logs: logs, exec_used: exec_used}
 
-        #TODO: remove result later
-        tx = Map.put(tx, :result, %{error: result})
         tx = Map.put(tx, :receipt, receipt)
 
         if !Map.has_key?(tx, :metadata) do tx else