mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 20:12:57 +01:00
code review and reset file perms
This commit is contained in:
parent
c3eb0c7887
commit
0db2d1596a
@ -196,7 +196,7 @@ script: |
|
|||||||
cp -rf contrib/windeploy $BUILD_DIR
|
cp -rf contrib/windeploy $BUILD_DIR
|
||||||
cd $BUILD_DIR/windeploy
|
cd $BUILD_DIR/windeploy
|
||||||
mkdir unsigned
|
mkdir unsigned
|
||||||
cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/
|
cp $OUTDIR/dashcore-*setup-unsigned.exe unsigned/
|
||||||
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
|
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
|
||||||
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
|
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
|
||||||
mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip
|
mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip
|
||||||
|
@ -175,22 +175,22 @@ Codesigner only: Create Windows/OS X detached signatures:
|
|||||||
|
|
||||||
Codesigner only: Sign the osx binary:
|
Codesigner only: Sign the osx binary:
|
||||||
|
|
||||||
transfer bitcoin-osx-unsigned.tar.gz to osx for signing
|
transfer dashcore-osx-unsigned.tar.gz to osx for signing
|
||||||
tar xf bitcoin-osx-unsigned.tar.gz
|
tar xf dashcore-osx-unsigned.tar.gz
|
||||||
./detached-sig-create.sh -s "Key ID"
|
./detached-sig-create.sh -s "Key ID"
|
||||||
Enter the keychain password and authorize the signature
|
Enter the keychain password and authorize the signature
|
||||||
Move signature-osx.tar.gz back to the gitian host
|
Move signature-osx.tar.gz back to the gitian host
|
||||||
|
|
||||||
Codesigner only: Sign the windows binaries:
|
Codesigner only: Sign the windows binaries:
|
||||||
|
|
||||||
tar xf bitcoin-win-unsigned.tar.gz
|
tar xf dashcore-win-unsigned.tar.gz
|
||||||
./detached-sig-create.sh -key /path/to/codesign.key
|
./detached-sig-create.sh -key /path/to/codesign.key
|
||||||
Enter the passphrase for the key when prompted
|
Enter the passphrase for the key when prompted
|
||||||
signature-win.tar.gz will be created
|
signature-win.tar.gz will be created
|
||||||
|
|
||||||
Codesigner only: Commit the detached codesign payloads:
|
Codesigner only: Commit the detached codesign payloads:
|
||||||
|
|
||||||
cd ~/bitcoin-detached-sigs
|
cd ~/dashcore-detached-sigs
|
||||||
checkout the appropriate branch for this release series
|
checkout the appropriate branch for this release series
|
||||||
rm -rf *
|
rm -rf *
|
||||||
tar xf signature-osx.tar.gz
|
tar xf signature-osx.tar.gz
|
||||||
|
0
qa/rpc-tests/bip68-112-113-p2p.py
Normal file → Executable file
0
qa/rpc-tests/bip68-112-113-p2p.py
Normal file → Executable file
0
qa/rpc-tests/bip68-sequence.py
Normal file → Executable file
0
qa/rpc-tests/bip68-sequence.py
Normal file → Executable file
0
qa/rpc-tests/getblocktemplate_longpoll.py
Normal file → Executable file
0
qa/rpc-tests/getblocktemplate_longpoll.py
Normal file → Executable file
0
qa/rpc-tests/maxuploadtarget.py
Normal file → Executable file
0
qa/rpc-tests/maxuploadtarget.py
Normal file → Executable file
0
qa/rpc-tests/nulldummy.py
Normal file → Executable file
0
qa/rpc-tests/nulldummy.py
Normal file → Executable file
0
qa/rpc-tests/p2p-compactblocks.py
Normal file → Executable file
0
qa/rpc-tests/p2p-compactblocks.py
Normal file → Executable file
0
qa/rpc-tests/prioritise_transaction.py
Normal file → Executable file
0
qa/rpc-tests/prioritise_transaction.py
Normal file → Executable file
0
qa/rpc-tests/smartfees.py
Normal file → Executable file
0
qa/rpc-tests/smartfees.py
Normal file → Executable file
0
qa/rpc-tests/test_framework/comptool.py
Normal file → Executable file
0
qa/rpc-tests/test_framework/comptool.py
Normal file → Executable file
0
qa/rpc-tests/test_framework/mininode.py
Normal file → Executable file
0
qa/rpc-tests/test_framework/mininode.py
Normal file → Executable file
54
qa/rpc-tests/test_framework/test_framework.py
Normal file → Executable file
54
qa/rpc-tests/test_framework/test_framework.py
Normal file → Executable file
@ -208,6 +208,33 @@ class BitcoinTestFramework(object):
|
|||||||
logging.shutdown()
|
logging.shutdown()
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
def _start_logging(self):
|
||||||
|
# Add logger and logging handlers
|
||||||
|
self.log = logging.getLogger('TestFramework')
|
||||||
|
self.log.setLevel(logging.DEBUG)
|
||||||
|
# Create file handler to log all messages
|
||||||
|
fh = logging.FileHandler(self.options.tmpdir + '/test_framework.log')
|
||||||
|
fh.setLevel(logging.DEBUG)
|
||||||
|
# Create console handler to log messages to stderr. By default this logs only error messages, but can be configured with --loglevel.
|
||||||
|
ch = logging.StreamHandler(sys.stdout)
|
||||||
|
# User can provide log level as a number or string (eg DEBUG). loglevel was caught as a string, so try to convert it to an int
|
||||||
|
ll = int(self.options.loglevel) if self.options.loglevel.isdigit() else self.options.loglevel.upper()
|
||||||
|
ch.setLevel(ll)
|
||||||
|
# Format logs the same as bitcoind's debug.log with microprecision (so log files can be concatenated and sorted)
|
||||||
|
formatter = logging.Formatter(fmt = '%(asctime)s.%(msecs)03d000 %(name)s (%(levelname)s): %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
|
||||||
|
fh.setFormatter(formatter)
|
||||||
|
ch.setFormatter(formatter)
|
||||||
|
# add the handlers to the logger
|
||||||
|
self.log.addHandler(fh)
|
||||||
|
self.log.addHandler(ch)
|
||||||
|
|
||||||
|
if self.options.trace_rpc:
|
||||||
|
rpc_logger = logging.getLogger("BitcoinRPC")
|
||||||
|
rpc_logger.setLevel(logging.DEBUG)
|
||||||
|
rpc_handler = logging.StreamHandler(sys.stdout)
|
||||||
|
rpc_handler.setLevel(logging.DEBUG)
|
||||||
|
rpc_logger.addHandler(rpc_handler)
|
||||||
|
|
||||||
|
|
||||||
MASTERNODE_COLLATERAL = 1000
|
MASTERNODE_COLLATERAL = 1000
|
||||||
|
|
||||||
@ -547,33 +574,6 @@ class DashTestFramework(BitcoinTestFramework):
|
|||||||
|
|
||||||
sync_blocks(self.nodes)
|
sync_blocks(self.nodes)
|
||||||
|
|
||||||
def _start_logging(self):
|
|
||||||
# Add logger and logging handlers
|
|
||||||
self.log = logging.getLogger('TestFramework')
|
|
||||||
self.log.setLevel(logging.DEBUG)
|
|
||||||
# Create file handler to log all messages
|
|
||||||
fh = logging.FileHandler(self.options.tmpdir + '/test_framework.log')
|
|
||||||
fh.setLevel(logging.DEBUG)
|
|
||||||
# Create console handler to log messages to stderr. By default this logs only error messages, but can be configured with --loglevel.
|
|
||||||
ch = logging.StreamHandler(sys.stdout)
|
|
||||||
# User can provide log level as a number or string (eg DEBUG). loglevel was caught as a string, so try to convert it to an int
|
|
||||||
ll = int(self.options.loglevel) if self.options.loglevel.isdigit() else self.options.loglevel.upper()
|
|
||||||
ch.setLevel(ll)
|
|
||||||
# Format logs the same as bitcoind's debug.log with microprecision (so log files can be concatenated and sorted)
|
|
||||||
formatter = logging.Formatter(fmt = '%(asctime)s.%(msecs)03d000 %(name)s (%(levelname)s): %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
|
|
||||||
fh.setFormatter(formatter)
|
|
||||||
ch.setFormatter(formatter)
|
|
||||||
# add the handlers to the logger
|
|
||||||
self.log.addHandler(fh)
|
|
||||||
self.log.addHandler(ch)
|
|
||||||
|
|
||||||
if self.options.trace_rpc:
|
|
||||||
rpc_logger = logging.getLogger("BitcoinRPC")
|
|
||||||
rpc_logger.setLevel(logging.DEBUG)
|
|
||||||
rpc_handler = logging.StreamHandler(sys.stdout)
|
|
||||||
rpc_handler.setLevel(logging.DEBUG)
|
|
||||||
rpc_logger.addHandler(rpc_handler)
|
|
||||||
|
|
||||||
# Test framework for doing p2p comparison testing, which sets up some bitcoind
|
# Test framework for doing p2p comparison testing, which sets up some bitcoind
|
||||||
# binaries:
|
# binaries:
|
||||||
# 1 binary: test binary
|
# 1 binary: test binary
|
||||||
|
0
qa/rpc-tests/wallet-hd.py
Normal file → Executable file
0
qa/rpc-tests/wallet-hd.py
Normal file → Executable file
@ -2538,6 +2538,12 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlySafe, const
|
|||||||
if (nDepth == 0 && !pcoin->InMempool())
|
if (nDepth == 0 && !pcoin->InMempool())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
bool safeTx = pcoin->IsTrusted();
|
||||||
|
|
||||||
|
if (fOnlySafe && !safeTx) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
|
for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
|
||||||
bool found = false;
|
bool found = false;
|
||||||
if(nCoinType == ONLY_DENOMINATED) {
|
if(nCoinType == ONLY_DENOMINATED) {
|
||||||
@ -2554,12 +2560,6 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlySafe, const
|
|||||||
}
|
}
|
||||||
if(!found) continue;
|
if(!found) continue;
|
||||||
|
|
||||||
bool safeTx = pcoin->IsTrusted();
|
|
||||||
|
|
||||||
if (fOnlySafe && !safeTx) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
isminetype mine = IsMine(pcoin->tx->vout[i]);
|
isminetype mine = IsMine(pcoin->tx->vout[i]);
|
||||||
if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&
|
if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&
|
||||||
(!IsLockedCoin((*it).first, i) || nCoinType == ONLY_1000) &&
|
(!IsLockedCoin((*it).first, i) || nCoinType == ONLY_1000) &&
|
||||||
@ -3227,7 +3227,7 @@ int CWallet::CountInputsWithAmount(CAmount nInputAmount)
|
|||||||
int nDepth = pcoin->GetDepthInMainChain();
|
int nDepth = pcoin->GetDepthInMainChain();
|
||||||
|
|
||||||
for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
|
for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
|
||||||
COutput out = COutput(pcoin, i, nDepth, true, true);
|
COutput out = COutput(pcoin, i, nDepth, true, true, false);
|
||||||
COutPoint outpoint = COutPoint(out.tx->GetHash(), out.i);
|
COutPoint outpoint = COutPoint(out.tx->GetHash(), out.i);
|
||||||
|
|
||||||
if(out.tx->tx->vout[out.i].nValue != nInputAmount) continue;
|
if(out.tx->tx->vout[out.i].nValue != nInputAmount) continue;
|
||||||
|
Loading…
Reference in New Issue
Block a user