diff --git a/deploy_docker.sh b/deploy_docker.sh new file mode 100755 index 000000000..2d0ab17cd --- /dev/null +++ b/deploy_docker.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +TARGET_HOST=$1 + +docker build -f lbry/scripts/Dockerfile.wallet_server -t lbry/wallet-server:segwit-dev . +IMAGE=`docker image inspect lbry/wallet-server:segwit-dev | sed -n "s/^.*Id\":\s*\"sha256:\s*\(\S*\)\".*$/\1/p"` +ssh $TARGET_HOST docker image rm lbry/wallet-server:segwit-dev +docker save $IMAGE | ssh $TARGET_HOST docker load +ssh $TARGET_HOST docker tag $IMAGE lbry/wallet-server:segwit-dev diff --git a/lbry/lbry/wallet/script.py b/lbry/lbry/wallet/script.py index 02f1bfda0..c6ab643a0 100644 --- a/lbry/lbry/wallet/script.py +++ b/lbry/lbry/wallet/script.py @@ -41,7 +41,16 @@ class OutputScript(BaseOutputScript): SUPPORT_CLAIM_SCRIPT = Template('support_claim+pay_script_hash', ( SUPPORT_CLAIM_OPCODES + BaseOutputScript.PAY_SCRIPT_HASH.opcodes )) - + SUPPORT_CLAIM_DATA_OPCODES = ( + OP_SUPPORT_CLAIM, PUSH_SINGLE('claim_name'), PUSH_SINGLE('claim_id'), PUSH_SINGLE('support'), + OP_2DROP, OP_2DROP + ) + SUPPORT_CLAIM_DATA_PUBKEY = Template('support_claim+data+pay_pubkey_hash', ( + SUPPORT_CLAIM_DATA_OPCODES + BaseOutputScript.PAY_PUBKEY_HASH.opcodes + )) + SUPPORT_CLAIM_DATA_SCRIPT = Template('support_claim+data+pay_script_hash', ( + SUPPORT_CLAIM_DATA_OPCODES + BaseOutputScript.PAY_SCRIPT_HASH.opcodes + )) UPDATE_CLAIM_OPCODES = ( OP_UPDATE_CLAIM, PUSH_SINGLE('claim_name'), PUSH_SINGLE('claim_id'), PUSH_SINGLE('claim'), OP_2DROP, OP_2DROP @@ -73,6 +82,8 @@ class OutputScript(BaseOutputScript): CLAIM_NAME_SCRIPT, SUPPORT_CLAIM_PUBKEY, SUPPORT_CLAIM_SCRIPT, + SUPPORT_CLAIM_DATA_PUBKEY, + SUPPORT_CLAIM_DATA_SCRIPT, UPDATE_CLAIM_PUBKEY, UPDATE_CLAIM_SCRIPT, SELL_CLAIM, SELL_SCRIPT,