From 36a06886423f4d9ec7c916805dc353e62b133bfa Mon Sep 17 00:00:00 2001 From: furszy Date: Tue, 31 Oct 2017 09:55:13 -0300 Subject: [PATCH] package name changed --- .DS_Store | Bin 0 -> 10244 bytes .travis.yml | 2 +- README.md | 2 +- core/.DS_Store | Bin 0 -> 8196 bytes ...-backup_org.pivx.production-2017-07-26 (2) | 411 ++++ core/findbugs.xml | 6 +- core/src/.DS_Store | Bin 0 -> 6148 bytes core/src/main/.DS_Store | Bin 0 -> 6148 bytes core/src/main/java/.DS_Store | Bin 0 -> 6148 bytes core/src/main/java/com/.DS_Store | Bin 0 -> 6148 bytes .../main/java/com/hashengineering/.DS_Store | Bin 0 -> 6148 bytes .../com/hashengineering/crypto/Hash9.java | 199 ++ .../hashengineering/crypto/HashFunction.java | 24 + .../hashengineering/crypto/Sha512Hash.java | 4 +- .../java/com/hashengineering/crypto/X11.java | 2 - .../hashengineering/utils/ByteArrayUtils.java | 31 + .../java/org/bitcoin/NativeSecp256k1.java | 2 +- .../java/org/darkcoinj/ActiveMasterNode.java | 2 +- .../src/main/java/org/darkcoinj/DarkSend.java | 4 +- .../DarkSendBroadcastTransaction.java | 4 +- .../java/org/darkcoinj/DarkSendEntry.java | 2 +- .../java/org/darkcoinj/DarkSendEntryVin.java | 4 +- .../main/java/org/darkcoinj/DarkSendPool.java | 8 +- .../java/org/darkcoinj/DarkSendSigner.java | 8 +- .../main/java/org/darkcoinj/InstantSend.java | 6 +- .../org/darkcoinj/MasterNodePayments.java | 2 +- .../core/AbstractBlockChain.java | 14 +- .../core/AbstractManager.java | 2 +- .../core/ActiveMasternode.java | 4 +- .../org/{bitcoinj => pivxj}/core/Address.java | 6 +- .../core/AddressFormatException.java | 2 +- .../core/AddressMessage.java | 2 +- .../core/AlertMessage.java | 2 +- .../org/{bitcoinj => pivxj}/core/Base58.java | 2 +- .../core/BitcoinSerializer.java | 5 +- .../org/{bitcoinj => pivxj}/core/Block.java | 13 +- .../{bitcoinj => pivxj}/core/BlockChain.java | 12 +- .../{bitcoinj => pivxj}/core/BloomFilter.java | 10 +- .../core/BudgetManager.java | 2 +- .../core/CheckpointManager.java | 14 +- .../core/ChildMessage.java | 2 +- .../org/{bitcoinj => pivxj}/core/Coin.java | 4 +- .../core/CoinDefinition.java | 2 +- .../org/{bitcoinj => pivxj}/core/Context.java | 28 +- .../core/DarkCoinSystem.java | 4 +- .../core/DarkSendElectionEntryMessage.java | 2 +- .../DarkSendElectionEntryPingMessage.java | 4 +- .../core/DarkSendEntryGetMessage.java | 2 +- .../core/DarkSendQueue.java | 8 +- .../core/DummySerializer.java | 2 +- .../core/DumpedPrivateKey.java | 2 +- .../org/{bitcoinj => pivxj}/core/ECKey.java | 18 +- .../core/EmptyMessage.java | 4 +- .../core/FilteredBlock.java | 3 +- .../core/FullPrunedBlockChain.java | 16 +- .../core/GetAddrMessage.java | 2 +- .../core/GetBlocksMessage.java | 2 +- .../core/GetDataMessage.java | 2 +- .../core/GetHeadersMessage.java | 2 +- ...etMasternodePaymentRequestSyncMessage.java | 2 +- .../core/GetMasternodeVoteSyncMessage.java | 3 +- .../core/GetSporksMessage.java | 2 +- .../core/GetUTXOsMessage.java | 2 +- .../core/GovernanceSyncMessage.java | 2 +- .../core/HeadersMessage.java | 2 +- .../core/InsufficientMoneyException.java | 2 +- .../core/InventoryItem.java | 2 +- .../core/InventoryMessage.java | 2 +- .../{bitcoinj => pivxj}/core/ListMessage.java | 2 +- .../core/MasterNodePaymentWinner.java | 6 +- .../core/MasterNodeSystem.java | 5 +- .../core/MasterNodeVote.java | 8 +- .../{bitcoinj => pivxj}/core/Masternode.java | 6 +- .../core/MasternodeAddress.java | 8 +- .../core/MasternodeBroadcast.java | 6 +- .../core/MasternodeInfo.java | 2 +- .../core/MasternodeManager.java | 20 +- .../core/MasternodeManagerListener.java | 2 +- .../core/MasternodePayments.java | 2 +- .../core/MasternodePing.java | 6 +- .../core/MasternodeSignature.java | 2 +- .../core/MasternodeSync.java | 7 +- .../core/MasternodeSyncListener.java | 2 +- .../core/MemoryPoolMessage.java | 2 +- .../org/{bitcoinj => pivxj}/core/Message.java | 2 +- .../core/MessageSerializer.java | 2 +- .../{bitcoinj => pivxj}/core/Monetary.java | 2 +- .../{bitcoinj => pivxj}/core/NetAddress.java | 4 +- .../core/NetworkParameters.java | 33 +- .../core/NotFoundMessage.java | 2 +- .../core/PartialMerkleTree.java | 4 +- .../org/{bitcoinj => pivxj}/core/Peer.java | 48 +- .../{bitcoinj => pivxj}/core/PeerAddress.java | 8 +- .../core/PeerException.java | 2 +- .../core/PeerFilterProvider.java | 4 +- .../{bitcoinj => pivxj}/core/PeerGroup.java | 48 +- .../core/PeerSocketHandler.java | 16 +- .../org/{bitcoinj => pivxj}/core/Ping.java | 2 +- .../org/{bitcoinj => pivxj}/core/Pong.java | 2 +- .../core/ProtocolException.java | 2 +- .../core/PrunedException.java | 2 +- .../{bitcoinj => pivxj}/core/PublicKey.java | 2 +- .../core/RejectMessage.java | 2 +- .../core/RejectedTransactionException.java | 2 +- .../core/ScriptException.java | 2 +- .../core/SendHeadersMessage.java | 2 +- .../{bitcoinj => pivxj}/core/Sha256Hash.java | 2 +- .../core/SporkManager.java | 2 +- .../core/SporkMessage.java | 7 +- .../{bitcoinj => pivxj}/core/StoredBlock.java | 7 +- .../core/StoredUndoableBlock.java | 2 +- .../core/SyncStatusCount.java | 5 +- .../{bitcoinj => pivxj}/core/Transaction.java | 36 +- .../core/TransactionBag.java | 8 +- .../core/TransactionBroadcast.java | 10 +- .../core/TransactionBroadcaster.java | 4 +- .../core/TransactionConfidence.java | 20 +- .../core/TransactionInput.java | 12 +- .../core/TransactionLock.java | 2 +- .../core/TransactionLockCandidate.java | 2 +- .../core/TransactionLockRequest.java | 2 +- .../core/TransactionLockVote.java | 2 +- .../core/TransactionOutPoint.java | 8 +- .../core/TransactionOutPointLock.java | 3 +- .../core/TransactionOutput.java | 8 +- .../core/TransactionOutputChanges.java | 2 +- .../core/TxConfidenceTable.java | 6 +- .../org/{bitcoinj => pivxj}/core/UTXO.java | 4 +- .../core/UTXOProvider.java | 4 +- .../core/UTXOProviderException.java | 2 +- .../core/UTXOsMessage.java | 4 +- .../core/UnknownMessage.java | 2 +- .../core/UnsafeByteArrayOutputStream.java | 2 +- .../org/{bitcoinj => pivxj}/core/Utils.java | 2 +- .../org/{bitcoinj => pivxj}/core/VarInt.java | 2 +- .../core/VerificationException.java | 2 +- .../{bitcoinj => pivxj}/core/VersionAck.java | 2 +- .../core/VersionMessage.java | 8 +- .../core/VersionedChecksummedBytes.java | 2 +- .../core/WrongNetworkException.java | 2 +- .../listeners/AbstractBlockChainListener.java | 4 +- .../AbstractPeerConnectionEventListener.java | 4 +- .../AbstractPeerDataEventListener.java | 4 +- .../listeners/AbstractPeerEventListener.java | 16 +- .../core/listeners/BlockChainListener.java | 2 +- .../BlocksDownloadedEventListener.java | 4 +- .../ChainDownloadStartedEventListener.java | 4 +- .../listeners/DownloadProgressTracker.java | 10 +- .../core/listeners/GetDataEventListener.java | 6 +- .../core/listeners/NewBestBlockListener.java | 10 +- .../OnTransactionBroadcastListener.java | 4 +- .../listeners/PeerConnectedEventListener.java | 4 +- .../PeerConnectionEventListener.java | 4 +- .../core/listeners/PeerDataEventListener.java | 4 +- .../PeerDisconnectedEventListener.java | 4 +- .../PeerDiscoveredEventListener.java | 6 +- .../PreMessageReceivedEventListener.java | 6 +- .../core/listeners/ReorganizeListener.java | 8 +- .../TransactionConfidenceEventListener.java | 6 +- .../TransactionReceivedInBlockListener.java | 12 +- .../core/package-info.java | 6 +- .../crypto/BIP38PrivateKey.java | 4 +- .../crypto/ChildNumber.java | 2 +- .../crypto/DRMWorkaround.java | 4 +- .../crypto/DeterministicHierarchy.java | 2 +- .../crypto/DeterministicKey.java | 13 +- .../crypto/EncryptableItem.java | 6 +- .../crypto/EncryptedData.java | 2 +- .../crypto/HDDerivationException.java | 2 +- .../crypto/HDKeyDerivation.java | 4 +- .../{bitcoinj => pivxj}/crypto/HDUtils.java | 4 +- .../crypto/KeyCrypter.java | 4 +- .../crypto/KeyCrypterException.java | 2 +- .../crypto/KeyCrypterScrypt.java | 10 +- .../crypto/LazyECPoint.java | 2 +- .../crypto/LinuxSecureRandom.java | 2 +- .../crypto/MnemonicCode.java | 8 +- .../crypto/MnemonicException.java | 2 +- .../crypto/PBKDF2SHA512.java | 2 +- .../crypto/TransactionSignature.java | 12 +- .../crypto/TrustStoreLoader.java | 2 +- .../{bitcoinj => pivxj}/crypto/X509Utils.java | 6 +- .../crypto/package-info.java | 2 +- .../jni/NativeBlockChainListener.java | 10 +- .../jni/NativeFutureCallback.java | 2 +- .../jni/NativeKeyChainEventListener.java | 6 +- .../NativePaymentChannelHandlerFactory.java | 6 +- ...ntChannelServerConnectionEventHandler.java | 8 +- .../jni/NativePeerEventListener.java | 6 +- .../jni/NativeScriptsChangeEventListener.java | 8 +- ...iveTransactionConfidenceEventListener.java | 8 +- .../NativeTransactionConfidenceListener.java | 4 +- .../jni/NativeWalletChangeEventListener.java | 6 +- ...ativeWalletCoinsReceivedEventListener.java | 10 +- .../NativeWalletCoinsSentEventListener.java | 10 +- .../jni/NativeWalletEventListener.java | 16 +- .../NativeWalletReorganizeEventListener.java | 6 +- .../kits/LevelDBWalletAppKit.java | 13 +- .../kits/WalletAppKit.java | 24 +- .../kits/package-info.java | 4 +- .../net/AbstractTimeoutHandler.java | 2 +- .../net/BlockingClient.java | 4 +- .../net/BlockingClientManager.java | 4 +- .../net/ClientConnectionManager.java | 2 +- .../net/ConnectionHandler.java | 6 +- .../{bitcoinj => pivxj}/net/FilterMerger.java | 12 +- .../net/MessageWriteTarget.java | 2 +- .../{bitcoinj => pivxj}/net/NioClient.java | 2 +- .../net/NioClientManager.java | 4 +- .../{bitcoinj => pivxj}/net/NioServer.java | 2 +- .../net/ProtobufConnection.java | 6 +- .../net/StreamConnection.java | 2 +- .../net/StreamConnectionFactory.java | 2 +- .../net/discovery/DnsDiscovery.java | 6 +- .../net/discovery/HttpDiscovery.java | 4 +- .../net/discovery/MultiplexingDiscovery.java | 11 +- .../net/discovery/PeerDiscovery.java | 2 +- .../net/discovery/PeerDiscoveryException.java | 2 +- .../net/discovery/SeedPeers.java | 4 +- .../net/discovery/TorDiscovery.java | 6 +- .../net/discovery/package-info.java | 2 +- .../{bitcoinj => pivxj}/net/package-info.java | 4 +- .../params/AbstractBitcoinNetParams.java | 11 +- .../params/MainNetParams.java | 7 +- .../{bitcoinj => pivxj}/params/Networks.java | 4 +- .../params/RegTestParams.java | 4 +- .../params/TestNet2Params.java | 5 +- .../params/TestNet3Params.java | 16 +- .../params/UnitTestParams.java | 8 +- .../params/package-info.java | 2 +- .../protocols/channels/ClientState.java | 198 +- .../channels/IPaymentChannelClient.java | 28 +- .../channels/PaymentChannelClient.java | 16 +- .../PaymentChannelClientConnection.java | 22 +- .../channels/PaymentChannelClientState.java | 20 +- .../PaymentChannelCloseException.java | 6 +- .../channels/PaymentChannelServer.java | 10 +- .../PaymentChannelServerListener.java | 18 +- .../channels/PaymentChannelServerState.java | 12 +- .../channels/PaymentChannelV1ClientState.java | 18 +- .../channels/PaymentChannelV1ServerState.java | 14 +- .../channels/PaymentChannelV2ClientState.java | 16 +- .../channels/PaymentChannelV2ServerState.java | 14 +- .../channels/PaymentIncrementAck.java | 4 +- .../ServerConnectionEventHandler.java | 12 +- .../protocols/channels/ServerState.java | 198 +- .../channels/Simple channels protocol.txt | 0 .../protocols/channels/StateMachine.java | 2 +- .../StoredPaymentChannelClientStates.java | 10 +- .../StoredPaymentChannelServerStates.java | 10 +- .../channels/StoredServerChannel.java | 8 +- .../channels/ValueOutOfRangeException.java | 2 +- .../protocols/channels/package-info.java | 2 +- .../protocols/package-info.java | 2 +- .../protocols/payments/PaymentProtocol.java | 11 +- .../payments/PaymentProtocolException.java | 2 +- .../protocols/payments/PaymentSession.java | 18 +- .../protocols/payments/package-info.java | 2 +- .../{bitcoinj => pivxj}/script/Script.java | 24 +- .../script/ScriptBuilder.java | 14 +- .../script/ScriptChunk.java | 6 +- .../script/ScriptOpCodes.java | 4 +- .../script/package-info.java | 2 +- .../signers/CustomTransactionSigner.java | 18 +- .../signers/LocalTransactionSigner.java | 26 +- .../signers/MissingSigResolutionSigner.java | 18 +- .../signers/StatelessTransactionSigner.java | 2 +- .../signers/TransactionSigner.java | 12 +- .../signers/package-info.java | 4 +- .../{bitcoinj => pivxj}/store/BlockStore.java | 14 +- .../store/BlockStoreException.java | 2 +- .../store/ChainFileLockedException.java | 2 +- .../store/DatabaseFullPrunedBlockStore.java | 14 +- .../org/{bitcoinj => pivxj}/store/FlatDB.java | 4 +- .../store/FullPrunedBlockStore.java | 10 +- .../store/H2FullPrunedBlockStore.java | 4 +- .../{bitcoinj => pivxj}/store/HashStore.java | 15 +- .../store/LevelDBBlockStore.java | 4 +- .../store/LevelDBFullPrunedBlockStore.java | 28 +- .../store/MasternodeDB.java | 4 +- .../store/MemoryBlockStore.java | 6 +- .../store/MemoryFullPrunedBlockStore.java | 6 +- .../store/MySQLFullPrunedBlockStore.java | 6 +- .../store/PostgresFullPrunedBlockStore.java | 8 +- .../store/SPVBlockStore.java | 6 +- .../store/WindowsMMapHack.java | 2 +- .../store/package-info.java | 2 +- .../uri/BitcoinURIParseException.java | 2 +- .../uri/OptionalFieldValidationException.java | 2 +- .../org/{bitcoinj => pivxj}/uri/PivxURI.java | 10 +- .../uri/RequiredFieldValidationException.java | 2 +- .../{bitcoinj => pivxj}/uri/package-info.java | 2 +- .../utils/BaseTaggableObject.java | 2 +- .../utils/BlockFileLoader.java | 10 +- .../utils/BriefLogFormatter.java | 4 +- .../utils/BtcAutoFormat.java | 6 +- .../utils/BtcFixedFormat.java | 6 +- .../{bitcoinj => pivxj}/utils/BtcFormat.java | 16 +- .../ContextPropagatingThreadFactory.java | 6 +- .../utils/DaemonThreadFactory.java | 2 +- .../utils/ExchangeRate.java | 4 +- .../utils/ExponentialBackoff.java | 4 +- .../org/{bitcoinj => pivxj}/utils/Fiat.java | 6 +- .../utils/ListenerRegistration.java | 2 +- .../utils/MonetaryFormat.java | 10 +- .../org/{bitcoinj => pivxj}/utils/Pair.java | 4 +- .../utils/TaggableObject.java | 4 +- .../{bitcoinj => pivxj}/utils/Threading.java | 14 +- .../utils/VersionTally.java | 16 +- .../utils/package-info.java | 4 +- .../wallet/AllRandomKeysRotating.java | 2 +- .../wallet/AllowUnconfirmedCoinSelector.java | 4 +- .../wallet/BasicKeyChain.java | 22 +- .../wallet/CoinSelection.java | 6 +- .../wallet/CoinSelector.java | 6 +- .../wallet/DecryptingKeyBag.java | 6 +- .../wallet/DefaultCoinSelector.java | 12 +- .../wallet/DefaultKeyChainFactory.java | 4 +- .../wallet/DefaultRiskAnalysis.java | 26 +- .../wallet/DeterministicKeyChain.java | 38 +- .../wallet/DeterministicSeed.java | 16 +- ...DeterministicUpgradeRequiredException.java | 2 +- .../DeterministicUpgradeRequiresPassword.java | 2 +- .../wallet/EncryptableKeyChain.java | 12 +- .../wallet/FilteringCoinSelector.java | 4 +- .../wallet/InstantXCoinSelector.java | 8 +- .../{bitcoinj => pivxj}/wallet/KeyBag.java | 4 +- .../{bitcoinj => pivxj}/wallet/KeyChain.java | 14 +- .../wallet/KeyChainFactory.java | 6 +- .../wallet/KeyChainGroup.java | 24 +- .../wallet/KeyTimeCoinSelector.java | 8 +- .../wallet/MarriedKeyChain.java | 18 +- .../{bitcoinj => pivxj}/wallet/Protos.java | 1974 ++++++++--------- .../wallet/RedeemData.java | 6 +- .../wallet/RiskAnalysis.java | 4 +- .../wallet/SendRequest.java | 30 +- .../wallet/UnreadableWalletException.java | 2 +- .../{bitcoinj => pivxj}/wallet/Wallet.java | 100 +- .../wallet/WalletExtension.java | 2 +- .../wallet/WalletFiles.java | 6 +- .../wallet/WalletProtobufSerializer.java | 28 +- .../wallet/WalletTransaction.java | 6 +- .../AbstractKeyChainEventListener.java | 4 +- .../AbstractWalletEventListener.java | 12 +- .../listeners/KeyChainEventListener.java | 6 +- .../listeners/ScriptsChangeEventListener.java | 6 +- .../listeners/WalletChangeEventListener.java | 4 +- .../WalletCoinsReceivedEventListener.java | 10 +- .../WalletCoinsSentEventListener.java | 8 +- .../wallet/listeners/WalletEventListener.java | 4 +- .../WalletReorganizeEventListener.java | 4 +- .../wallet/package-info.java | 4 +- .../org/{bitcoinj => pivxj}/crypto/cacerts | Bin .../crypto/mnemonic/wordlist/english.txt | 0 core/src/storedclientpaymentchannel.proto | 2 +- core/src/storedserverpaymentchannel.proto | 2 +- core/src/test/.DS_Store | Bin 0 -> 6148 bytes core/src/test/java/.DS_Store | Bin 0 -> 6148 bytes .../AbstractFullPrunedBlockChainTest.java | 24 +- .../{bitcoinj => pivxj}/core/AddressTest.java | 14 +- .../core/AlertMessageTest.java | 6 +- .../{bitcoinj => pivxj}/core/Base58Test.java | 2 +- .../core/BitcoinSerializerTest.java | 6 +- .../core/BitcoindComparisonTool.java | 14 +- .../core/BlockChainTest.java | 28 +- .../{bitcoinj => pivxj}/core/BlockTest.java | 20 +- .../core/BloomFilterTest.java | 10 +- .../core/ChainSplitTest.java | 30 +- .../{bitcoinj => pivxj}/core/CoinTest.java | 6 +- .../org/{bitcoinj => pivxj}/core/Crypto.java | 2 +- .../core/DumpedPrivateKeyTest.java | 6 +- .../{bitcoinj => pivxj}/core/ECKeyTest.java | 30 +- ...ilteredBlockAndPartialMerkleTreeTests.java | 12 +- .../core/FullBlockTestGenerator.java | 14 +- .../core/H2FullPrunedBlockChainTest.java | 8 +- .../core/LevelDBFullPrunedBlockChainTest.java | 8 +- .../core/MainBlockTest.java | 16 +- .../core/MasternodeTest.java | 4 +- .../{bitcoinj => pivxj}/core/MatiTest.java | 47 +- .../core/MemoryFullPrunedBlockChainTest.java | 8 +- .../{bitcoinj => pivxj}/core/MessageTest.java | 4 +- .../core/MySQLFullPrunedBlockChainTest.java | 10 +- .../core/ParseByteCacheTest.java | 20 +- .../core/PeerAddressTest.java | 6 +- .../core/PeerGroupTest.java | 14 +- .../{bitcoinj => pivxj}/core/PeerTest.java | 22 +- .../PostgresFullPrunedBlockChainTest.java | 10 +- .../core/TransactionBroadcastTest.java | 14 +- .../core/TransactionOutputTest.java | 12 +- .../core/TransactionTest.java | 14 +- .../core/TxConfidenceTableTest.java | 10 +- .../{bitcoinj => pivxj}/core/UtilsTest.java | 2 +- .../{bitcoinj => pivxj}/core/VarIntTest.java | 2 +- .../core/VersionMessageTest.java | 12 +- .../core/VersionedChecksummedBytesTest.java | 8 +- .../crypto/BIP32MatiTest.java | 8 +- .../{bitcoinj => pivxj}/crypto/BIP32Test.java | 10 +- .../crypto/BIP38PrivateKeyTest.java | 10 +- .../crypto/ChildKeyDerivationTest.java | 10 +- .../crypto/HDUtilsTest.java | 4 +- .../crypto/KeyCrypterScryptTest.java | 10 +- .../crypto/MnemonicCodeTest.java | 6 +- .../crypto/X509UtilsTest.java | 2 +- .../net/NetworkAbstractionTests.java | 4 +- .../net/discovery/SeedPeersTest.java | 4 +- .../channels/ChannelConnectionTest.java | 26 +- .../protocols/channels/ChannelTestUtils.java | 10 +- .../channels/PaymentChannelClientTest.java | 8 +- .../channels/PaymentChannelServerTest.java | 10 +- .../channels/PaymentChannelStateTest.java | 20 +- .../payments/PaymentProtocolTest.java | 22 +- .../payments/PaymentSessionTest.java | 12 +- .../script/ScriptChunkTest.java | 8 +- .../script/ScriptTest.java | 20 +- .../store/LevelDBBlockStoreTest.java | 6 +- .../store/SPVBlockStoreTest.java | 12 +- .../store/WalletProtobufSerializerTest.java | 48 +- .../testing/FakeTxBuilder.java | 14 +- .../testing/FooWalletExtension.java | 6 +- .../testing/InboundMessageQueuer.java | 6 +- .../testing/KeyChainTransactionSigner.java | 12 +- .../testing/MockTransactionBroadcaster.java | 8 +- .../testing/NopTransactionSigner.java | 6 +- .../testing/TestWithNetworkConnections.java | 24 +- .../testing/TestWithPeerGroup.java | 10 +- .../testing/TestWithWallet.java | 18 +- .../testing/package-info.java | 4 +- .../{bitcoinj => pivxj}/uri/PivxURITest.java | 14 +- .../utils/BaseTaggableObjectTest.java | 2 +- .../utils/BtcFormatTest.java | 16 +- .../utils/ExchangeRateTest.java | 4 +- .../utils/ExponentialBackoffTest.java | 4 +- .../{bitcoinj => pivxj}/utils/FiatTest.java | 4 +- .../utils/MonetaryFormatTest.java | 12 +- .../utils/VersionTallyTest.java | 20 +- .../wallet/BasicKeyChainTest.java | 21 +- .../wallet/DefaultCoinSelectorTest.java | 10 +- .../wallet/DefaultRiskAnalysisTest.java | 18 +- .../wallet/DeterministicKeyChainTest.java | 18 +- .../wallet/KeyChainGroupTest.java | 16 +- .../wallet/WalletExtensionsTest.java | 6 +- .../wallet/WalletTest.java | 90 +- core/src/test/resources/logging.properties | 2 +- .../org/bitcoinj/core/block169482.dat | Bin 18678 -> 0 bytes .../org/bitcoinj/core/block227835.dat | Bin 53899 -> 0 bytes .../org/bitcoinj/core/block227836.dat | Bin 39628 -> 0 bytes .../org/bitcoinj/core/block363703.dat | Bin 612096 -> 0 bytes .../org/bitcoinj/core/block370661.dat | Bin 381223 -> 0 bytes .../org/bitcoinj/core/block383616.dat | Bin 749224 -> 0 bytes .../org/bitcoinj/core/block_testnet21066.dat | Bin 380 -> 0 bytes .../org/bitcoinj/core/block_testnet32768.dat | Bin 1093 -> 0 bytes .../org/bitcoinj/core/first-100k-blocks.dat | Bin 99969 -> 0 bytes .../core/sig_canonical.json | 0 .../core/sig_noncanonical.json | 0 .../crypto/comodo-smime.crt | 0 .../crypto/startssl-client.crt | 0 .../crypto/startssl-smime.crt | 0 .../protocols/payments/README | 0 .../payments/pki_test.bitcoinpaymentrequest | Bin .../protocols/payments/test-cacert.key | 0 .../protocols/payments/test-cacerts | Bin .../protocols/payments/test-expired-cert | Bin .../protocols/payments/test-valid-cert | Bin .../script/script_invalid.json | 0 .../script/script_valid.json | 0 .../script/tx_invalid.json | 0 .../{bitcoinj => pivxj}/script/tx_valid.json | 0 .../deterministic-wallet-serialization.txt | 0 .../wallet/watching-wallet-serialization.txt | 0 core/src/wallet.proto | 2 +- .../examples/BackupToMnemonicSeed.java | 12 +- .../examples/DoubleSpend.java | 18 +- .../examples/DumpWallet.java | 4 +- .../examples/ExamplePaymentChannelClient.java | 26 +- .../examples/ExamplePaymentChannelServer.java | 20 +- .../examples/FetchBlock.java | 12 +- .../examples/FetchTransactions.java | 12 +- .../examples/ForwardingService.java | 30 +- .../examples/GenerateLowSTests.java | 38 +- .../org/{bitcoinj => pivxj}/examples/Kit.java | 30 +- .../{bitcoinj => pivxj}/examples/LevelDB.java | 12 +- .../examples/LevelDbSizes.java | 2 +- .../examples/NetworkEnum.java | 10 +- .../examples/PeerMonitor.java | 20 +- .../examples/PrintPeers.java | 24 +- .../examples/PrivateKeys.java | 10 +- .../examples/RefreshWallet.java | 16 +- .../examples/RestoreFromSeed.java | 18 +- .../examples/SendRequest.java | 12 +- examples/src/main/python/forwarding.py | 10 +- tools/pom.xml | 4 +- .../tools/BlockImporter.java | 16 +- .../tools/BuildCheckpoints.java | 27 +- .../tools/NetworkEnum.java | 2 +- .../tools/PaymentProtocolTool.java | 14 +- .../tools/TestFeeLevel.java | 18 +- .../{bitcoinj => pivxj}/tools/WalletTool.java | 66 +- .../tools/WatchMempool.java | 25 +- .../tools/build-checkpoints-help.txt | 0 .../tools/wallet-tool-help.txt | 0 .../src/main/java/wallettemplate/Main.java | 14 +- .../java/wallettemplate/MainController.java | 6 +- .../wallettemplate/SendMoneyController.java | 6 +- .../WalletPasswordController.java | 2 +- .../WalletSetPasswordController.java | 4 +- .../WalletSettingsController.java | 8 +- .../controls/BitcoinAddressValidator.java | 6 +- .../controls/ClickableBitcoinAddress.java | 4 +- .../wallettemplate/utils/BitcoinUIModel.java | 9 +- .../utils/KeyDerivationTasks.java | 2 +- 510 files changed, 3872 insertions(+), 3285 deletions(-) create mode 100644 .DS_Store create mode 100644 core/.DS_Store create mode 100644 core/1.01_pivx-wallet-backup_org.pivx.production-2017-07-26 (2) create mode 100644 core/src/.DS_Store create mode 100644 core/src/main/.DS_Store create mode 100644 core/src/main/java/.DS_Store create mode 100644 core/src/main/java/com/.DS_Store create mode 100644 core/src/main/java/com/hashengineering/.DS_Store create mode 100644 core/src/main/java/com/hashengineering/crypto/Hash9.java create mode 100644 core/src/main/java/com/hashengineering/crypto/HashFunction.java create mode 100644 core/src/main/java/com/hashengineering/utils/ByteArrayUtils.java rename core/src/main/java/org/{bitcoinj => pivxj}/core/AbstractBlockChain.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/AbstractManager.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/ActiveMasternode.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Address.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/AddressFormatException.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/AddressMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/AlertMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Base58.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/BitcoinSerializer.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Block.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/BlockChain.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/BloomFilter.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/BudgetManager.java (83%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/CheckpointManager.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/ChildMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Coin.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/CoinDefinition.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Context.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/DarkCoinSystem.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/DarkSendElectionEntryMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/DarkSendElectionEntryPingMessage.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/DarkSendEntryGetMessage.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/DarkSendQueue.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/DummySerializer.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/DumpedPrivateKey.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/ECKey.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/EmptyMessage.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/FilteredBlock.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/FullPrunedBlockChain.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetAddrMessage.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetBlocksMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetDataMessage.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetHeadersMessage.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetMasternodePaymentRequestSyncMessage.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetMasternodeVoteSyncMessage.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetSporksMessage.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GetUTXOsMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/GovernanceSyncMessage.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/HeadersMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/InsufficientMoneyException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/InventoryItem.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/InventoryMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/ListMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasterNodePaymentWinner.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasterNodeSystem.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasterNodeVote.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Masternode.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeAddress.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeBroadcast.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeInfo.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeManager.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeManagerListener.java (84%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodePayments.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodePing.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeSignature.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeSync.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MasternodeSyncListener.java (85%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MemoryPoolMessage.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Message.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/MessageSerializer.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Monetary.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/NetAddress.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/NetworkParameters.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/NotFoundMessage.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PartialMerkleTree.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Peer.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PeerAddress.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PeerException.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PeerFilterProvider.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PeerGroup.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PeerSocketHandler.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Ping.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Pong.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/ProtocolException.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PrunedException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/PublicKey.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/RejectMessage.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/RejectedTransactionException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/ScriptException.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/SendHeadersMessage.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Sha256Hash.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/SporkManager.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/SporkMessage.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/StoredBlock.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/StoredUndoableBlock.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/SyncStatusCount.java (89%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Transaction.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionBag.java (85%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionBroadcast.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionBroadcaster.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionConfidence.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionInput.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionLock.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionLockCandidate.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionLockRequest.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionLockVote.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionOutPoint.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionOutPointLock.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionOutput.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TransactionOutputChanges.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/TxConfidenceTable.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/UTXO.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/UTXOProvider.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/UTXOProviderException.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/UTXOsMessage.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/UnknownMessage.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/UnsafeByteArrayOutputStream.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/Utils.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/VarInt.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/VerificationException.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/VersionAck.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/VersionMessage.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/VersionedChecksummedBytes.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/WrongNetworkException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/AbstractBlockChainListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/AbstractPeerConnectionEventListener.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/AbstractPeerDataEventListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/AbstractPeerEventListener.java (86%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/BlockChainListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/BlocksDownloadedEventListener.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/ChainDownloadStartedEventListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/DownloadProgressTracker.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/GetDataEventListener.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/NewBestBlockListener.java (78%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/OnTransactionBroadcastListener.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/PeerConnectedEventListener.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/PeerConnectionEventListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/PeerDataEventListener.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/PeerDisconnectedEventListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/PeerDiscoveredEventListener.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/PreMessageReceivedEventListener.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/ReorganizeListener.java (86%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/TransactionConfidenceEventListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/listeners/TransactionReceivedInBlockListener.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/core/package-info.java (83%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/BIP38PrivateKey.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/ChildNumber.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/DRMWorkaround.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/DeterministicHierarchy.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/DeterministicKey.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/EncryptableItem.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/EncryptedData.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/HDDerivationException.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/HDKeyDerivation.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/HDUtils.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/KeyCrypter.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/KeyCrypterException.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/KeyCrypterScrypt.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/LazyECPoint.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/LinuxSecureRandom.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/MnemonicCode.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/MnemonicException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/PBKDF2SHA512.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/TransactionSignature.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/TrustStoreLoader.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/X509Utils.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/crypto/package-info.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeBlockChainListener.java (88%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeFutureCallback.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeKeyChainEventListener.java (89%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativePaymentChannelHandlerFactory.java (87%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativePaymentChannelServerConnectionEventHandler.java (87%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativePeerEventListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeScriptsChangeEventListener.java (87%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeTransactionConfidenceEventListener.java (86%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeTransactionConfidenceListener.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeWalletChangeEventListener.java (89%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeWalletCoinsReceivedEventListener.java (84%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeWalletCoinsSentEventListener.java (84%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeWalletEventListener.java (86%) rename core/src/main/java/org/{bitcoinj => pivxj}/jni/NativeWalletReorganizeEventListener.java (88%) rename core/src/main/java/org/{bitcoinj => pivxj}/kits/LevelDBWalletAppKit.java (65%) rename core/src/main/java/org/{bitcoinj => pivxj}/kits/WalletAppKit.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/kits/package-info.java (80%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/AbstractTimeoutHandler.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/BlockingClient.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/BlockingClientManager.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/ClientConnectionManager.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/ConnectionHandler.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/FilterMerger.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/MessageWriteTarget.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/NioClient.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/NioClientManager.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/NioServer.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/ProtobufConnection.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/StreamConnection.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/StreamConnectionFactory.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/DnsDiscovery.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/HttpDiscovery.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/MultiplexingDiscovery.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/PeerDiscovery.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/PeerDiscoveryException.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/SeedPeers.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/TorDiscovery.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/discovery/package-info.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/net/package-info.java (89%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/AbstractBitcoinNetParams.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/MainNetParams.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/Networks.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/RegTestParams.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/TestNet2Params.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/TestNet3Params.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/UnitTestParams.java (89%) rename core/src/main/java/org/{bitcoinj => pivxj}/params/package-info.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/ClientState.java (85%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/IPaymentChannelClient.java (83%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelClient.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelClientConnection.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelClientState.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelCloseException.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelServer.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelServerListener.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelServerState.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelV1ClientState.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelV1ServerState.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelV2ClientState.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelV2ServerState.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentIncrementAck.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/ServerConnectionEventHandler.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/ServerState.java (82%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/Simple channels protocol.txt (100%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/StateMachine.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/StoredPaymentChannelClientStates.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/StoredPaymentChannelServerStates.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/StoredServerChannel.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/ValueOutOfRangeException.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/channels/package-info.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/package-info.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/payments/PaymentProtocol.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/payments/PaymentProtocolException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/payments/PaymentSession.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/protocols/payments/package-info.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/script/Script.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/script/ScriptBuilder.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/script/ScriptChunk.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/script/ScriptOpCodes.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/script/package-info.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/signers/CustomTransactionSigner.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/signers/LocalTransactionSigner.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/signers/MissingSigResolutionSigner.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/signers/StatelessTransactionSigner.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/signers/TransactionSigner.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/signers/package-info.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/BlockStore.java (86%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/BlockStoreException.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/ChainFileLockedException.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/DatabaseFullPrunedBlockStore.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/FlatDB.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/FullPrunedBlockStore.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/H2FullPrunedBlockStore.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/HashStore.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/LevelDBBlockStore.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/LevelDBFullPrunedBlockStore.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/MasternodeDB.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/MemoryBlockStore.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/MemoryFullPrunedBlockStore.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/MySQLFullPrunedBlockStore.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/PostgresFullPrunedBlockStore.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/SPVBlockStore.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/WindowsMMapHack.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/store/package-info.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/uri/BitcoinURIParseException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/uri/OptionalFieldValidationException.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/uri/PivxURI.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/uri/RequiredFieldValidationException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/uri/package-info.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/BaseTaggableObject.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/BlockFileLoader.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/BriefLogFormatter.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/BtcAutoFormat.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/BtcFixedFormat.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/BtcFormat.java (99%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/ContextPropagatingThreadFactory.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/DaemonThreadFactory.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/ExchangeRate.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/ExponentialBackoff.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/Fiat.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/ListenerRegistration.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/MonetaryFormat.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/Pair.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/TaggableObject.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/Threading.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/VersionTally.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/utils/package-info.java (83%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/AllRandomKeysRotating.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/AllowUnconfirmedCoinSelector.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/BasicKeyChain.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/CoinSelection.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/CoinSelector.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DecryptingKeyBag.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DefaultCoinSelector.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DefaultKeyChainFactory.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DefaultRiskAnalysis.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DeterministicKeyChain.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DeterministicSeed.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DeterministicUpgradeRequiredException.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/DeterministicUpgradeRequiresPassword.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/EncryptableKeyChain.java (86%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/FilteringCoinSelector.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/InstantXCoinSelector.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/KeyBag.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/KeyChain.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/KeyChainFactory.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/KeyChainGroup.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/KeyTimeCoinSelector.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/MarriedKeyChain.java (97%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/Protos.java (87%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/RedeemData.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/RiskAnalysis.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/SendRequest.java (94%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/UnreadableWalletException.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/Wallet.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/WalletExtension.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/WalletFiles.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/WalletProtobufSerializer.java (98%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/WalletTransaction.java (92%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/AbstractKeyChainEventListener.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/AbstractWalletEventListener.java (89%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/KeyChainEventListener.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/ScriptsChangeEventListener.java (91%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/WalletChangeEventListener.java (96%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/WalletCoinsReceivedEventListener.java (87%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/WalletCoinsSentEventListener.java (93%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/WalletEventListener.java (90%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/listeners/WalletReorganizeEventListener.java (95%) rename core/src/main/java/org/{bitcoinj => pivxj}/wallet/package-info.java (83%) rename core/src/main/resources/org/{bitcoinj => pivxj}/crypto/cacerts (100%) rename core/src/main/resources/org/{bitcoinj => pivxj}/crypto/mnemonic/wordlist/english.txt (100%) create mode 100644 core/src/test/.DS_Store create mode 100644 core/src/test/java/.DS_Store rename core/src/test/java/org/{bitcoinj => pivxj}/core/AbstractFullPrunedBlockChainTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/AddressTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/AlertMessageTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/Base58Test.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/BitcoinSerializerTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/BitcoindComparisonTool.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/BlockChainTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/BlockTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/BloomFilterTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/ChainSplitTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/CoinTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/Crypto.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/DumpedPrivateKeyTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/ECKeyTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/FilteredBlockAndPartialMerkleTreeTests.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/FullBlockTestGenerator.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/H2FullPrunedBlockChainTest.java (89%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/LevelDBFullPrunedBlockChainTest.java (89%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/MainBlockTest.java (93%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/MasternodeTest.java (96%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/MatiTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/MemoryFullPrunedBlockChainTest.java (86%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/MessageTest.java (96%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/MySQLFullPrunedBlockChainTest.java (87%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/ParseByteCacheTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/PeerAddressTest.java (93%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/PeerGroupTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/PeerTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/PostgresFullPrunedBlockChainTest.java (91%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/TransactionBroadcastTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/TransactionOutputTest.java (93%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/TransactionTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/TxConfidenceTableTest.java (96%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/UtilsTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/VarIntTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/VersionMessageTest.java (90%) rename core/src/test/java/org/{bitcoinj => pivxj}/core/VersionedChecksummedBytesTest.java (93%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/BIP32MatiTest.java (96%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/BIP32Test.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/BIP38PrivateKeyTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/ChildKeyDerivationTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/HDUtilsTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/KeyCrypterScryptTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/MnemonicCodeTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/crypto/X509UtilsTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/net/NetworkAbstractionTests.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/net/discovery/SeedPeersTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/protocols/channels/ChannelConnectionTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/protocols/channels/ChannelTestUtils.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelClientTest.java (96%) rename core/src/test/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelServerTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/protocols/channels/PaymentChannelStateTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/protocols/payments/PaymentProtocolTest.java (92%) rename core/src/test/java/org/{bitcoinj => pivxj}/protocols/payments/PaymentSessionTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/script/ScriptChunkTest.java (90%) rename core/src/test/java/org/{bitcoinj => pivxj}/script/ScriptTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/store/LevelDBBlockStoreTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/store/SPVBlockStoreTest.java (89%) rename core/src/test/java/org/{bitcoinj => pivxj}/store/WalletProtobufSerializerTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/FakeTxBuilder.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/FooWalletExtension.java (92%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/InboundMessageQueuer.java (91%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/KeyChainTransactionSigner.java (86%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/MockTransactionBroadcaster.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/NopTransactionSigner.java (91%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/TestWithNetworkConnections.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/TestWithPeerGroup.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/TestWithWallet.java (91%) rename core/src/test/java/org/{bitcoinj => pivxj}/testing/package-info.java (51%) rename core/src/test/java/org/{bitcoinj => pivxj}/uri/PivxURITest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/utils/BaseTaggableObjectTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/utils/BtcFormatTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/utils/ExchangeRateTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/utils/ExponentialBackoffTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/utils/FiatTest.java (96%) rename core/src/test/java/org/{bitcoinj => pivxj}/utils/MonetaryFormatTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/utils/VersionTallyTest.java (90%) rename core/src/test/java/org/{bitcoinj => pivxj}/wallet/BasicKeyChainTest.java (95%) rename core/src/test/java/org/{bitcoinj => pivxj}/wallet/DefaultCoinSelectorTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/wallet/DefaultRiskAnalysisTest.java (97%) rename core/src/test/java/org/{bitcoinj => pivxj}/wallet/DeterministicKeyChainTest.java (98%) rename core/src/test/java/org/{bitcoinj => pivxj}/wallet/KeyChainGroupTest.java (99%) rename core/src/test/java/org/{bitcoinj => pivxj}/wallet/WalletExtensionsTest.java (90%) rename core/src/test/java/org/{bitcoinj => pivxj}/wallet/WalletTest.java (98%) delete mode 100644 core/src/test/resources/org/bitcoinj/core/block169482.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/block227835.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/block227836.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/block363703.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/block370661.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/block383616.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/block_testnet21066.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/block_testnet32768.dat delete mode 100644 core/src/test/resources/org/bitcoinj/core/first-100k-blocks.dat rename core/src/test/resources/org/{bitcoinj => pivxj}/core/sig_canonical.json (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/core/sig_noncanonical.json (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/crypto/comodo-smime.crt (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/crypto/startssl-client.crt (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/crypto/startssl-smime.crt (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/protocols/payments/README (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/protocols/payments/pki_test.bitcoinpaymentrequest (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/protocols/payments/test-cacert.key (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/protocols/payments/test-cacerts (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/protocols/payments/test-expired-cert (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/protocols/payments/test-valid-cert (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/script/script_invalid.json (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/script/script_valid.json (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/script/tx_invalid.json (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/script/tx_valid.json (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/wallet/deterministic-wallet-serialization.txt (100%) rename core/src/test/resources/org/{bitcoinj => pivxj}/wallet/watching-wallet-serialization.txt (100%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/BackupToMnemonicSeed.java (87%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/DoubleSpend.java (86%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/DumpWallet.java (94%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/ExamplePaymentChannelClient.java (94%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/ExamplePaymentChannelServer.java (93%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/FetchBlock.java (88%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/FetchTransactions.java (90%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/ForwardingService.java (91%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/GenerateLowSTests.java (89%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/Kit.java (84%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/LevelDB.java (84%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/LevelDbSizes.java (98%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/NetworkEnum.java (83%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/PeerMonitor.java (96%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/PrintPeers.java (89%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/PrivateKeys.java (94%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/RefreshWallet.java (87%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/RestoreFromSeed.java (92%) rename examples/src/main/java/org/{bitcoinj => pivxj}/examples/SendRequest.java (95%) rename tools/src/main/java/org/{bitcoinj => pivxj}/tools/BlockImporter.java (89%) rename tools/src/main/java/org/{bitcoinj => pivxj}/tools/BuildCheckpoints.java (93%) rename tools/src/main/java/org/{bitcoinj => pivxj}/tools/NetworkEnum.java (96%) rename tools/src/main/java/org/{bitcoinj => pivxj}/tools/PaymentProtocolTool.java (93%) rename tools/src/main/java/org/{bitcoinj => pivxj}/tools/TestFeeLevel.java (91%) rename tools/src/main/java/org/{bitcoinj => pivxj}/tools/WalletTool.java (97%) rename tools/src/main/java/org/{bitcoinj => pivxj}/tools/WatchMempool.java (86%) rename tools/src/main/resources/org/{bitcoinj => pivxj}/tools/build-checkpoints-help.txt (100%) rename tools/src/main/resources/org/{bitcoinj => pivxj}/tools/wallet-tool-help.txt (100%) diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3164a5421cef4bd400be2315c0cbe65b4fc143bc GIT binary patch literal 10244 zcmeHMYit`u5T42N?(({nwrMbKOw&NxCav2hwCM}yMR8xLnxskkO3%I{IePY`zO$1y z4GKs_fDnj>1mz)6#UE6p{;GudgTxzwD2Rxc03q>@UkH971Z8&DiR^RwqkjNZx0Y{q zXJ>YIX212!o&f;6()vb#5CBN@WmK)C$0CLGvu{Bu%5v(7BI!favg0w!j!|1JkoFnA z2Ye6s9`HTjd%*X=|G@(kvssZU1ofZ32Ye6s9$4@I`+W$}m(fU;&I-zZI_SZ#07OfO z%?s6e>Q6Mp7(^pkIx8q~sGv|KDpWCh#lY;%0fjpCN3!y>f(ms&J~NGzof)$?6wF>c zFvP_HBZB%*-vhn}3O&H??j^7u#=rzO|Nf43)Yp8C7p_=6F9#a9^huFU4AN9H!13sw z_vk7Mx+cw)1e>&te4QfAqf<&cCg?P}=8?SWk*pv|wjK>Kq~TEO3?#tvXtD91&#|W* zI$;n7;9ls1L(rcu4ciOmh{HIoB@U-xg4S=66|UEAc-^B_L-LDg@%2s>c>H&db~$v@ z+77}9MBxDJUSx&2_LR_Ei};nVX;Hb@q%)CyU-NNn!ZIB<9R3=Mic3n%$|YHrC#e1dCSy|ShhZ3+txx|iybzN$x(G_x1Dq~Giju9#E%V`N!_08veQZ3 z;o}_C+;P(76OF1Xrl;H5+FC-JHiu_gLem}X;g(Q)xP4|ulIof^?u?#HoH;vvZsvgt z%#5Z?(UhZs;*IMmng~+a&6Kz?=y|m;H0U$ z<0G0AH&AaFg=;dIPAoi^PwYNI60sns=A zN<-jwS-m11(`gm^ZJo`e^PWIMph=RBGJbc;pr>Ff&4IPDs!0P586t*gRW`_~BM+RS z{S>O3lr~A#(g5 zpXRuI6GoDzXV&#L1Og+B->K_{E=f{jq*?4VcSB<&ELt*U5A}4WB6OCI(HWhf^Zz(J z0Z+n<@ETl(EATda2%o}L_#D1~@8Bo+1%87+;V<|buAzi7R$wL8<0@>#)fmPO+=e@F zCwAdp+=mCS4+ro#p1_l+;TTTfX>`!Vb9f#f#z*lnd)Q!Be;HBDKL7=(q$_fn_D+++0nVM zjh>y$1rf)M00sxlJRtb?<)cu5SqTmju8gVcVOlL`2$JTQbVDc@R2g(cb9ECniwNDK zxn^xpQHu$?G8bOIK?$m*1XIzwxlK{j62h_Q-P%FDWrSF1uD))?a%Gnik=Y?rfh)^R zK}C{p9DNtz61)W;z$b*dui!`c8GeO72yvxYgLQ#zk|@h;p-$lFfX z>&4v|#XW?-0X&SuID$tojs~G`98F9S`Z73)Q}`f0#8LPNK7~&c4xc3)Uc^ft)J5m< zCMdpyk6yI2!)+wUIy-|*52DuSMqBA!|(KkUS&!YNb*+8y* zG2BmMoB8n!S@g@5DxvXMG>_-YvB->4P8=`eQIEx0$`(Ab6p!;{Ra&7*S;7>ppq1(x z%R_i1XSqf}&cH0q(=R6-o8;Eh2!+y=_2fyHQC`tYSw;`+hu-{^F>CW=Z2DMUf3t|6Cs_@XWU0mXhGlLBjm~z8<#C=Yj9Z*L3vG&Dd=K~@@IByr z;HL6Gv9Kn@-v9Sr|NsA+%4Xjf-vhn}@;!hhJ^ejh#GAjQ=68#?{2^kV%yuxjS^5&? zD)iv5H7fu5p8@{;|3+U|`S<^u?Ee1`p(=JP literal 0 HcmV?d00001 diff --git a/.travis.yml b/.travis.yml index 2ead96e7f..d8ce39939 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,5 @@ after_success: notifications: irc: - channels: "irc.freenode.net#bitcoinj" + channels: "irc.freenode.net#pivxj" skip_join: true diff --git a/README.md b/README.md index e743ab5ae..ab260a201 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ If you send coins to that address, it will forward them on to the address you sp ``` cd examples - mvn exec:java -Dexec.mainClass=org.bitcoinj.examples.ForwardingService -Dexec.args="" + mvn exec:java -Dexec.mainClass=org.pivxj.examples.ForwardingService -Dexec.args="" ``` Note that this example app *does not use checkpointing*, so the initial chain sync will be pretty slow. You can make an app that starts up and does the initial sync much faster by including a checkpoints file; see the documentation for diff --git a/core/.DS_Store b/core/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..87e485df92be95c189f67ca3c407c8e5abf786f0 GIT binary patch literal 8196 zcmeHMTWl0n82--7PgSA%TQB$(;Y3 z|NP&%eDlqooU;IcZ5eF?KqUY$dbm}VP{LP--jqY+{S%7C9L<;L78_1AX`Xo zFHxD!0Ujpm+qiG1g!Q1*r#L;J4@LiofdWqLQ65eL9izgM!b3Ms;6DfR(qp!tcLg+}tt$G)D2 zT})V;;;uT9w~o0Z70{g0kj$MAp3CcV5#4U66gNco8+pux)c=Z2j5;Zw#g7vy({S8a z>>CUf6c#O7%p{3PCG2?jusz!Cs&2+FGJ)$9fG*vq#(PjHNkVKL=EIn6TbJ14`w@L{n2!eRSid*kpZlqNO=jA8n2`Pfjvc zQM+MB*Wk$b>4`Iw51yw5Q9}P07s^C^Hh+OiIfQ6V(oE1aIUuLObh7PY^`YlxR{!nn z>g6TjuHAd&0cB~H7PUX+8n)#e($fyv0j10#TDp?9bs(+t_THpzW=1S$Kq*hEW-?={ zuHI^z-NtF%>2vilmzRz>cG_+C0{aZYa^HZWWE}l|od8Bw?;x0?pmec#d1Tcc>tfAY z@9vl`DJ@gVm&)=H;@xtM6Na8XIBIC_@L|Xv3$L%mtUF%qWUW2qy0Ii8oK>5>%{ zl~uQf!wZG>WfI1zjNy(eHH=LwrDY{@b@+Bkxy+7fG>d(<#z)e;mT+~rma(JU-=5Yf z7jC&OyjD_F*5lAZL>CS6dP#Alo|E*l1$3j_#1u_BXsQX_6t2y33sd$;y;;GgaBi1( zvU04K`jYm@2(8l*?$&TSQ$Aw-eC)ldn`rzVlFC3#!Bn9K}I6MJQ!i(@4T!PE+Hhc)5!sqY>dQ2*5=8|l1f z*L9NYcf~@dw=7$}vZk(K4@LplA5{01U$U)MUKDLmq zmBm~|Y??<`MC%u;KucGL@6Sviq=g{vaA%6mPPB9 z7HVBYs%6tv6_qRGopM~_ADRLlSgMW4O#1%{yZ{&BE%*RFA?1AyKfy2X8~jPCE5b6Y zAkE!|5nPFP;u>6s_1J)S;TBTgHqu`w?!qqIO&aXML)eFh@dzeSCj}0pfoW1;7DsUm z&*DR#5+A{*@M+TGv!ulfcrj0TT{D^!7T?HMUbZ`JnYJ}V{u#CALate@K=f3}&;OkZ z-~V5;@q&&51_B0dJO;3^qr0Px=C#o84L@r~=^3PlCmuH?tOucthj71l949;bhar`t aep}qPQ^HaUrR#GM5bXb2u>arG`~ScA!?BV8 literal 0 HcmV?d00001 diff --git a/core/1.01_pivx-wallet-backup_org.pivx.production-2017-07-26 (2) b/core/1.01_pivx-wallet-backup_org.pivx.production-2017-07-26 (2) new file mode 100644 index 000000000..59c42cade --- /dev/null +++ b/core/1.01_pivx-wallet-backup_org.pivx.production-2017-07-26 (2) @@ -0,0 +1,411 @@ +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 +AbbbiRLHgSWoItIeap9rkZRpF+Kcvw== \ No newline at end of file diff --git a/core/findbugs.xml b/core/findbugs.xml index 1fbc59d8d..dc680c09b 100644 --- a/core/findbugs.xml +++ b/core/findbugs.xml @@ -16,11 +16,11 @@ - + - + @@ -38,7 +38,7 @@ - + diff --git a/core/src/.DS_Store b/core/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f73892976afdc582d9dbc865d91ee9d1900947f4 GIT binary patch literal 6148 zcmeHK%}T>S5T0$LCWx4WV2^w8)p8*;4Acf4&)1ec%EsFIhG|)* zwPoIP`bpl&ylkAh-snm`g+b5P_IZ*-bKCPT!d`xB?;Iy_=7n)@^eO!MGK_;Hcaw1( zq;j7#FY9BjJm}W0OeXuSMwQnOo6{>vr|I*H;+o+P zQ_8l+8N8w~FL0soSqvdDKnxHAE6RYr8qLiWt&hqg28e;*Ga&8AJRvE6ZEiPI8DM znHS&zfGdCRLEoWI!WCwAw-IgO8UdP-X203pnc4W;XmjpuulnD{(c5%@0xG|5=J1e?B64tyZ=Lr{*akpG%io=K7Wr+ zv$U)_opaGxXfEDZa$I-0<+g6NUWNlT4l7v=%dRXAsrO7)gGd&A?{1jJ30enfTn&0j zzLzDVB!5~wkyT<`drD>Kpu>7HdY&fZzIS^^<&{kHq|mudju!`M9;P zq6rnY#1OV}5GEYw1M6QKG~poh%9zKlENq1$Y~dk%?G7R^$SpI#3|wYl!E`;k|M&h} z|6dN`9y7oU{8tQ!=5Dy##ZR(#>$Q)gyVgfNLM0);+Tbh%4Sf}(FI~lVP_^K=PX=OO Tu{MY!DEtu6G;qTV%$0$kFx+^q literal 0 HcmV?d00001 diff --git a/core/src/main/java/.DS_Store b/core/src/main/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0a072be5ecdaecb4df4442d18bb78f8a138758eb GIT binary patch literal 6148 zcmeHK%}(1u5S~o}II1dgKmu;QAaTec;iptWm8?Jy+>lbW2dKa%0W29Wa-2pGg8Urq z6ZBR30(~6#c6UHEv{w|W8EN*Lot;^GzqNKfM5H>yUYn>vL>|;&rHtya_DSbsN}c;4bl`@`Px z#nturW^()8ZH2;DYGt1B0e-;X^?mDRX`<6JcuaJKPAPlB%uo2s%xKE!tQ@5lpG2W6 zA`A!v!oZX;z^9@2W=h^iUPBlV2BwDrb3XV`g8^gV&>kIVYzY9Y!EFV${rLy_#sLf% z3y1JPluHG=RK+ER;@UyEbc_caUpRE>r0kP14?kIPg`&9hP`(W(6*!bu7!U@^3{+jW zVebEr|E~YbNzxMrgn|Ex0ae@W?sl*wzFVIy&fK*=^cZTy#1#%7Q()Mu7_sImUV>VI Y-!}#@U@RQM1CbvAOM^7Rz>6|)59Zcx(EtDd literal 0 HcmV?d00001 diff --git a/core/src/main/java/com/.DS_Store b/core/src/main/java/com/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8b376443c9e341d0f033236e3be44db601201c49 GIT binary patch literal 6148 zcmeHK&1%~~5T13MMy8bbP-t@7OP~iI?6moTQV?!>$gSYe9@3IXwXg+>Hdt~^;yUO# z+BfP8^l{p6XV=EXDY-SF%)rby9?k4}zZJV0B2wLPzeCg{q5x{K)_}Q1>~pItQuC2D zpyDwS%4t9;Y_gIqfrrR|-MdX1QbYyp^8O_>;+-5EXXbO9nHZV&HF*Vn{)+|Poz?NA zxb)RO;>#>8%69vws;$-6A8iDUM$mW?eCiF&q*q4exadZsQ~s6qli2$w#$*dWir=Tn z&6Ckm`o|Ax-Zzu38Rz|i$9Wf(L)7v_XU*;Dbhq8vYw6v?y;)074-VQb z{qn{BY!(F1b~>+*&o8d7r(b6`-*{!D@K&>IdYr>|ICrr2r8mkmlMj$NA7x%GC=3V# z!oYnq;LoMt@qPahnO_(X1|A#(_I%J#i=oHLAs-zu+yVgW2(!SqABna`dkj5R4)Fw{ zTq)3%D&Jx#SB|*$d7;P3p(`iln-Aq@R=z_~JUhnMoK7lqC{`E{2L5Eg_I{A2z5n0- zz5nMVF~Wc_@P9I(>PNk!F4pGn)|FM-yH-Qbp;l~O<#15~hp%Gf+N*dA%7VDI4lwjs SIYa~^9|BB+7-8U_GVmKe+h`yF literal 0 HcmV?d00001 diff --git a/core/src/main/java/com/hashengineering/.DS_Store b/core/src/main/java/com/hashengineering/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..44f5e9c4aa130de69fee1023dde7b9e3e15d8c6d GIT binary patch literal 6148 zcmeHK%}N6?5T4Xlw}{w-pvPPU4?VR0vvYl~f2H>JC^XszsP=o|Pb zK7o&;Gf9*#)vFenfypli*JO!lTJv^dh&=uw~>H4 z2-TGzDt{uH9n;7F&D|_qK@aYr3)%UjMX`;#_O3<$ekRr*#9ceruYNZS;-pe}6SY805dS1 z4A?EunV-(zJ@05kBf7!dir=3WDbWY5-#!O>YOQ7=(RC@wYlm4b#oiZPas;uTaa=$B+5x)xJ| R=t1F&fTn>9X5d#D_yEUrYVH64 literal 0 HcmV?d00001 diff --git a/core/src/main/java/com/hashengineering/crypto/Hash9.java b/core/src/main/java/com/hashengineering/crypto/Hash9.java new file mode 100644 index 000000000..bc38d8db3 --- /dev/null +++ b/core/src/main/java/com/hashengineering/crypto/Hash9.java @@ -0,0 +1,199 @@ +/* + * Copyright 2014 Hash Engineering Solutions. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hashengineering.crypto; + +import fr.cryptohash.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import static com.hashengineering.utils.ByteArrayUtils.trim256; + +/** + * Created by Hash Engineering Solutions 2/18/14. + * + * This class implements the Quark Proof Of Work hashing function, + * which is also used as the block hash + * + */ + +public class Hash9 extends HashFunction { + private static final Logger log = LoggerFactory.getLogger(Hash9.class); + + static BLAKE512 blake512; + static BMW512 bmw512; + static Groestl512 groestl512; + static Skein512 skein512; + static JH512 jh512; + static Keccak512 keccak512; + + static { + loadNativeLibrary("hash9"); + + //if(native_library_loaded == false) + { + blake512 = new BLAKE512(); + bmw512 = new BMW512(); + groestl512 = new Groestl512(); + skein512 = new Skein512(); + jh512 = new JH512(); + keccak512 = new Keccak512(); + } + } + + public static byte[] digest(byte[] input, int offset, int length) + { + try { + /*byte [] result = null; + long start = System.currentTimeMillis(); + result = hash9(input, 0, input.length); + timeJ2 += System.currentTimeMillis() - start; + + start = System.currentTimeMillis(); + result = hash9_native(input, 0, input.length); + timeN2 += System.currentTimeMillis() - start; + if(count2 == 100) + { + log.info("[stats] Quark Java New: "+ timeJ2); + + log.info("[stats] Quark Native: "+ timeN2); + count2 = 0; + timeJ2 = timeN2 = 0; + } + count2++; + return result;*/ + return native_library_loaded ? hash9_native(input, offset, length) : hash9(input, offset, length); + } + catch(Exception e) { + return null; + } + } + + static long timeJ = 0; + static long timeN = 0; + static long timeNO = 0; + static int count = 0; + static long timeJ2 = 0; + static long timeN2 = 0; + static int count2 = 0; + + public static byte[] digest(byte[] input) { + + try { + /* + byte [] result = null; + long start = System.currentTimeMillis(); + result = hash9(input, 0, input.length); + timeJ += System.currentTimeMillis() - start; + start = System.currentTimeMillis(); + result = hash9_native_old(input); + timeNO += System.currentTimeMillis() - start; + start = System.currentTimeMillis(); + result = hash9_native(input, 0, input.length); + timeN += System.currentTimeMillis() - start; + if(count == 100) + { + log.info("[stats] Quark Java New: "+ timeJ); + log.info("[stats] Quark Native: "+ timeN); + log.info("[stats] Quark Native Old: "+ timeNO); + count = 0; + timeJ = timeN = timeNO = 0; + } + count++; + return result;*/ + return native_library_loaded ? hash9_native(input, 0, input.length) : hash9(input, 0, input.length); + } catch (Exception e) { + return null; + } + } + + static native byte [] hash9_native(byte [] input, int offset, int length); + static native byte [] hash9_native_old(byte [] input); + + static byte [] hash9(byte header[]) + { + return hash9(header, 0, header.length); + } + /* + Java implimentation of the Quark Hashing Algorithm. + It consists of 6 of the SHA-3 candidates. There are 9 rounds. + Every third round is a "random" hash based on the + 0x8 bit of the first byte of the previous hash. + + The hashes are all calculated to result with 512 bits (64 bytes). + The result returned is the first 32 bytes. + + Order: + blake + bmw + (groestl or skein) + groestl + jh + (blake or bmw) + keccak + skein + (keccak or jh) + */ + static byte [] hash9(byte [] header, int offset, int length) + { + byte [][] hash = new byte[9][]; + + + blake512.update(header, offset, length); + + hash[0] = blake512.digest(); + + hash[1] = bmw512.digest(hash[0]); + + if((hash[1][0] & 8) != 0) + { + hash[2] = groestl512.digest(hash[1]); + } + else + { + hash[2] = skein512.digest(hash[1]); + } + + hash[3] = groestl512.digest(hash[2]); + + hash[4] = jh512.digest(hash[3]); + + if((hash[4][0] & 8) != 0) + { + hash[5] = blake512.digest(hash[4]); + } + else + { + hash[5] = bmw512.digest(hash[4]); + } + + hash[6] = keccak512.digest(hash[5]); + + hash[7] = skein512.digest(hash[6]); + + if((hash[7][0] & 8) != 0) + { + hash[8] = keccak512.digest(hash[7]); + } + else + { + hash[8] = jh512.digest(hash[7]); + } + + return trim256(hash[8]); + } + + + +} diff --git a/core/src/main/java/com/hashengineering/crypto/HashFunction.java b/core/src/main/java/com/hashengineering/crypto/HashFunction.java new file mode 100644 index 000000000..9fd52a16e --- /dev/null +++ b/core/src/main/java/com/hashengineering/crypto/HashFunction.java @@ -0,0 +1,24 @@ +package com.hashengineering.crypto; + +/** + * Created by Eric on 7/2/14. + */ +public class HashFunction { + protected static boolean native_library_loaded = false; + + static void loadNativeLibrary(String name) + { + try { + System.loadLibrary(name); + native_library_loaded = true; + } + catch(UnsatisfiedLinkError e) + { + native_library_loaded = false; + } + catch(Exception e) + { + native_library_loaded = false; + } + } +} diff --git a/core/src/main/java/com/hashengineering/crypto/Sha512Hash.java b/core/src/main/java/com/hashengineering/crypto/Sha512Hash.java index 2a8f647cd..ee341e543 100644 --- a/core/src/main/java/com/hashengineering/crypto/Sha512Hash.java +++ b/core/src/main/java/com/hashengineering/crypto/Sha512Hash.java @@ -17,8 +17,8 @@ package com.hashengineering.crypto; import com.google.common.io.ByteStreams; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.Utils; +import org.pivxj.core.Sha256Hash; +import org.pivxj.core.Utils; import org.spongycastle.util.encoders.Hex; import java.io.File; diff --git a/core/src/main/java/com/hashengineering/crypto/X11.java b/core/src/main/java/com/hashengineering/crypto/X11.java index 069780499..56abe1ac2 100644 --- a/core/src/main/java/com/hashengineering/crypto/X11.java +++ b/core/src/main/java/com/hashengineering/crypto/X11.java @@ -1,7 +1,5 @@ package com.hashengineering.crypto; -import org.bitcoinj.core.Sha256Hash; - import fr.cryptohash.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/hashengineering/utils/ByteArrayUtils.java b/core/src/main/java/com/hashengineering/utils/ByteArrayUtils.java new file mode 100644 index 000000000..aec88d8c9 --- /dev/null +++ b/core/src/main/java/com/hashengineering/utils/ByteArrayUtils.java @@ -0,0 +1,31 @@ +/* + * Copyright 2014 Hash Engineering Solutions. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hashengineering.utils; + +/** + * Created by HashEngineering on 7/2/14. + */ +public class ByteArrayUtils { + + public static byte[] trim256(byte [] bytes) + { + byte [] result = new byte[32]; + for (int i = 0; i < 32; i++){ + result[i] = bytes[i]; + } + return result; + } +} diff --git a/core/src/main/java/org/bitcoin/NativeSecp256k1.java b/core/src/main/java/org/bitcoin/NativeSecp256k1.java index 40ae76d7c..51c9a16bc 100644 --- a/core/src/main/java/org/bitcoin/NativeSecp256k1.java +++ b/core/src/main/java/org/bitcoin/NativeSecp256k1.java @@ -31,7 +31,7 @@ * *

You can find an example library that can be used for this at https://github.com/bitcoin/secp256k1

* - *

To build secp256k1 for use with bitcoinj, run + *

To build secp256k1 for use with pivxj, run * `./configure --enable-jni --enable-experimental --enable-module-schnorr --enable-module-ecdh` * and `make` then copy `.libs/libsecp256k1.so` to your system library path * or point the JVM to the folder containing it with -Djava.library.path diff --git a/core/src/main/java/org/darkcoinj/ActiveMasterNode.java b/core/src/main/java/org/darkcoinj/ActiveMasterNode.java index 63f115da9..588373610 100644 --- a/core/src/main/java/org/darkcoinj/ActiveMasterNode.java +++ b/core/src/main/java/org/darkcoinj/ActiveMasterNode.java @@ -1,6 +1,6 @@ package org.darkcoinj; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/darkcoinj/DarkSend.java b/core/src/main/java/org/darkcoinj/DarkSend.java index 25909d563..e2fd08a2c 100644 --- a/core/src/main/java/org/darkcoinj/DarkSend.java +++ b/core/src/main/java/org/darkcoinj/DarkSend.java @@ -1,7 +1,7 @@ package org.darkcoinj; -import org.bitcoinj.core.DarkSendQueue; -import org.bitcoinj.core.Sha256Hash; +import org.pivxj.core.DarkSendQueue; +import org.pivxj.core.Sha256Hash; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/darkcoinj/DarkSendBroadcastTransaction.java b/core/src/main/java/org/darkcoinj/DarkSendBroadcastTransaction.java index 3d1323846..e017a119c 100644 --- a/core/src/main/java/org/darkcoinj/DarkSendBroadcastTransaction.java +++ b/core/src/main/java/org/darkcoinj/DarkSendBroadcastTransaction.java @@ -1,7 +1,7 @@ package org.darkcoinj; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionInput; +import org.pivxj.core.Transaction; +import org.pivxj.core.TransactionInput; /** * Created by Eric on 2/8/2015. diff --git a/core/src/main/java/org/darkcoinj/DarkSendEntry.java b/core/src/main/java/org/darkcoinj/DarkSendEntry.java index ab5a29910..2d4f19587 100644 --- a/core/src/main/java/org/darkcoinj/DarkSendEntry.java +++ b/core/src/main/java/org/darkcoinj/DarkSendEntry.java @@ -1,6 +1,6 @@ package org.darkcoinj; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.util.ArrayList; diff --git a/core/src/main/java/org/darkcoinj/DarkSendEntryVin.java b/core/src/main/java/org/darkcoinj/DarkSendEntryVin.java index ad28d89dc..e98667aef 100644 --- a/core/src/main/java/org/darkcoinj/DarkSendEntryVin.java +++ b/core/src/main/java/org/darkcoinj/DarkSendEntryVin.java @@ -1,7 +1,7 @@ package org.darkcoinj; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.TransactionInput; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.TransactionInput; /** * Created by Eric on 2/8/2015. diff --git a/core/src/main/java/org/darkcoinj/DarkSendPool.java b/core/src/main/java/org/darkcoinj/DarkSendPool.java index 31b6dc4d6..183bfc77a 100644 --- a/core/src/main/java/org/darkcoinj/DarkSendPool.java +++ b/core/src/main/java/org/darkcoinj/DarkSendPool.java @@ -1,9 +1,9 @@ package org.darkcoinj; -import org.bitcoinj.core.*; -import org.bitcoinj.script.Script; -import org.bitcoinj.utils.ContextPropagatingThreadFactory; -import org.bitcoinj.utils.Threading; +import org.pivxj.core.*; +import org.pivxj.script.Script; +import org.pivxj.utils.ContextPropagatingThreadFactory; +import org.pivxj.utils.Threading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/darkcoinj/DarkSendSigner.java b/core/src/main/java/org/darkcoinj/DarkSendSigner.java index 5b088171f..b39b55e09 100644 --- a/core/src/main/java/org/darkcoinj/DarkSendSigner.java +++ b/core/src/main/java/org/darkcoinj/DarkSendSigner.java @@ -1,10 +1,10 @@ package org.darkcoinj; import com.google.common.base.Charsets; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.KeyCrypterException; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; +import org.pivxj.core.*; +import org.pivxj.crypto.KeyCrypterException; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Base64; diff --git a/core/src/main/java/org/darkcoinj/InstantSend.java b/core/src/main/java/org/darkcoinj/InstantSend.java index 534bacbf4..c61e98d3c 100644 --- a/core/src/main/java/org/darkcoinj/InstantSend.java +++ b/core/src/main/java/org/darkcoinj/InstantSend.java @@ -1,15 +1,15 @@ package org.darkcoinj; import com.google.common.collect.Lists; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.Threading; +import org.pivxj.core.*; +import org.pivxj.utils.Threading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.locks.ReentrantLock; -import static org.bitcoinj.core.DarkCoinSystem.fMasterNode; +import static org.pivxj.core.DarkCoinSystem.fMasterNode; /** * Created by Eric on 2/8/2015. diff --git a/core/src/main/java/org/darkcoinj/MasterNodePayments.java b/core/src/main/java/org/darkcoinj/MasterNodePayments.java index 008706d3f..896af6f71 100644 --- a/core/src/main/java/org/darkcoinj/MasterNodePayments.java +++ b/core/src/main/java/org/darkcoinj/MasterNodePayments.java @@ -1,6 +1,6 @@ package org.darkcoinj; -import org.bitcoinj.core.MasterNodePaymentWinner; +import org.pivxj.core.MasterNodePaymentWinner; import java.util.ArrayList; diff --git a/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java b/core/src/main/java/org/pivxj/core/AbstractBlockChain.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java rename to core/src/main/java/org/pivxj/core/AbstractBlockChain.java index 30fd5401b..5c7482686 100644 --- a/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java +++ b/core/src/main/java/org/pivxj/core/AbstractBlockChain.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.*; import com.google.common.collect.*; import com.google.common.util.concurrent.*; -import org.bitcoinj.core.listeners.*; -import org.bitcoinj.store.*; -import org.bitcoinj.utils.*; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.listeners.*; +import org.pivxj.store.*; +import org.pivxj.utils.*; +import org.pivxj.wallet.Wallet; import org.slf4j.*; import javax.annotation.*; @@ -44,7 +44,7 @@ *

An AbstractBlockChain implementation must be connected to a {@link BlockStore} implementation. The chain object * by itself doesn't store any data, that's delegated to the store. Which store you use is a decision best made by * reading the getting started guide, but briefly, fully validating block chains need fully validating stores. In - * the lightweight SPV mode, a {@link org.bitcoinj.store.SPVBlockStore} is the right choice.

+ * the lightweight SPV mode, a {@link org.pivxj.store.SPVBlockStore} is the right choice.

* *

This class implements an abstract class which makes it simple to create a BlockChain that does/doesn't do full * verification. It verifies headers and is implements most of what is required to implement SPV mode, but @@ -53,7 +53,7 @@ *

There are two subclasses of AbstractBlockChain that are useful: {@link BlockChain}, which is the simplest * class and implements simplified payment verification. This is a lightweight and efficient mode that does * not verify the contents of blocks, just their headers. A {@link FullPrunedBlockChain} paired with a - * {@link org.bitcoinj.store.H2FullPrunedBlockStore} implements full verification, which is equivalent to + * {@link org.pivxj.store.H2FullPrunedBlockStore} implements full verification, which is equivalent to * Bitcoin Core. To learn more about the alternative security models, please consult the articles on the * website.

* diff --git a/core/src/main/java/org/bitcoinj/core/AbstractManager.java b/core/src/main/java/org/pivxj/core/AbstractManager.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/AbstractManager.java rename to core/src/main/java/org/pivxj/core/AbstractManager.java index 14b71f299..07648de1c 100644 --- a/core/src/main/java/org/bitcoinj/core/AbstractManager.java +++ b/core/src/main/java/org/pivxj/core/AbstractManager.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import static com.google.common.base.Preconditions.checkState; diff --git a/core/src/main/java/org/bitcoinj/core/ActiveMasternode.java b/core/src/main/java/org/pivxj/core/ActiveMasternode.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/ActiveMasternode.java rename to core/src/main/java/org/pivxj/core/ActiveMasternode.java index 574856cdc..28c92763b 100644 --- a/core/src/main/java/org/bitcoinj/core/ActiveMasternode.java +++ b/core/src/main/java/org/pivxj/core/ActiveMasternode.java @@ -1,6 +1,6 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.utils.Threading; +import org.pivxj.utils.Threading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/Address.java b/core/src/main/java/org/pivxj/core/Address.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/Address.java rename to core/src/main/java/org/pivxj/core/Address.java index 2b9d6a127..4785c34f9 100644 --- a/core/src/main/java/org/bitcoinj/core/Address.java +++ b/core/src/main/java/org/pivxj/core/Address.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.bitcoinj.params.Networks; -import org.bitcoinj.script.Script; +import org.pivxj.params.Networks; +import org.pivxj.script.Script; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/core/AddressFormatException.java b/core/src/main/java/org/pivxj/core/AddressFormatException.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/AddressFormatException.java rename to core/src/main/java/org/pivxj/core/AddressFormatException.java index 865282543..a204112c5 100644 --- a/core/src/main/java/org/bitcoinj/core/AddressFormatException.java +++ b/core/src/main/java/org/pivxj/core/AddressFormatException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; @SuppressWarnings("serial") public class AddressFormatException extends IllegalArgumentException { diff --git a/core/src/main/java/org/bitcoinj/core/AddressMessage.java b/core/src/main/java/org/pivxj/core/AddressMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/AddressMessage.java rename to core/src/main/java/org/pivxj/core/AddressMessage.java index b4053852d..3ad5c9aa8 100644 --- a/core/src/main/java/org/bitcoinj/core/AddressMessage.java +++ b/core/src/main/java/org/pivxj/core/AddressMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/AlertMessage.java b/core/src/main/java/org/pivxj/core/AlertMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/AlertMessage.java rename to core/src/main/java/org/pivxj/core/AlertMessage.java index 2e6e9e419..106f12062 100644 --- a/core/src/main/java/org/bitcoinj/core/AlertMessage.java +++ b/core/src/main/java/org/pivxj/core/AlertMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.util.Date; import java.util.HashSet; diff --git a/core/src/main/java/org/bitcoinj/core/Base58.java b/core/src/main/java/org/pivxj/core/Base58.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/Base58.java rename to core/src/main/java/org/pivxj/core/Base58.java index dc07b0236..61183ea0e 100644 --- a/core/src/main/java/org/bitcoinj/core/Base58.java +++ b/core/src/main/java/org/pivxj/core/Base58.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.math.BigInteger; import java.util.Arrays; diff --git a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java b/core/src/main/java/org/pivxj/core/BitcoinSerializer.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java rename to core/src/main/java/org/pivxj/core/BitcoinSerializer.java index c81a26262..f58637c81 100644 --- a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java +++ b/core/src/main/java/org/pivxj/core/BitcoinSerializer.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongycastle.util.encoders.Hex; import java.io.IOException; import java.io.OutputStream; @@ -28,7 +27,7 @@ import java.util.HashMap; import java.util.Map; -import static org.bitcoinj.core.Utils.*; +import static org.pivxj.core.Utils.*; /** *

Methods to serialize and de-serialize messages to the Bitcoin network format as defined in diff --git a/core/src/main/java/org/bitcoinj/core/Block.java b/core/src/main/java/org/pivxj/core/Block.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/Block.java rename to core/src/main/java/org/pivxj/core/Block.java index 815a5b105..b33698648 100644 --- a/core/src/main/java/org/bitcoinj/core/Block.java +++ b/core/src/main/java/org/pivxj/core/Block.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.annotations.*; import com.google.common.base.*; import com.google.common.collect.*; -import org.bitcoinj.params.MainNetParams; -import org.bitcoinj.script.*; +import org.pivxj.script.*; import org.slf4j.*; import com.hashengineering.crypto.Hash9; import javax.annotation.*; @@ -29,8 +28,8 @@ import java.math.*; import java.util.*; -import static org.bitcoinj.core.Coin.*; -import static org.bitcoinj.core.Sha256Hash.*; +import static org.pivxj.core.Coin.*; +import static org.pivxj.core.Sha256Hash.*; //import com.sun.xml.internal.ws.api.config.management.policy.ManagedServiceAssertion; @@ -231,7 +230,7 @@ public Block(NetworkParameters params, long version, Sha256Hash prevBlockHash, S * the system it was 50 coins per block, in late 2012 it went to 25 coins per block, and so on. The size of * a coinbase transaction is inflation plus fees.

* - *

The half-life is controlled by {@link org.bitcoinj.core.NetworkParameters#getSubsidyDecreaseBlockCount()}. + *

The half-life is controlled by {@link org.pivxj.core.NetworkParameters#getSubsidyDecreaseBlockCount()}. *

*/ @@ -945,7 +944,7 @@ public void setTime(long time) { * Returns the difficulty of the proof of work that this block should meet encoded in compact form. The {@link * BlockChain} verifies that this is not too easy by looking at the length of the chain when the block is added. * To find the actual value the hash should be compared against, use - * {@link org.bitcoinj.core.Block#getDifficultyTargetAsInteger()}. Note that this is not the same as + * {@link org.pivxj.core.Block#getDifficultyTargetAsInteger()}. Note that this is not the same as * the difficulty value reported by the Bitcoin "getdifficulty" RPC that you may see on various block explorers. * That number is the result of applying a formula to the underlying difficulty to normalize the minimum to 1. * Calculating the difficulty that way is currently unsupported. diff --git a/core/src/main/java/org/bitcoinj/core/BlockChain.java b/core/src/main/java/org/pivxj/core/BlockChain.java similarity index 94% rename from core/src/main/java/org/bitcoinj/core/BlockChain.java rename to core/src/main/java/org/pivxj/core/BlockChain.java index dd1152ae8..bafadebae 100644 --- a/core/src/main/java/org/bitcoinj/core/BlockChain.java +++ b/core/src/main/java/org/pivxj/core/BlockChain.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import static com.google.common.base.Preconditions.checkArgument; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; +import org.pivxj.wallet.Wallet; import java.util.ArrayList; import java.util.List; @@ -42,8 +42,8 @@ public class BlockChain extends AbstractBlockChain { * one from scratch, or you can deserialize a saved wallet from disk using * {@link Wallet#loadFromFile(java.io.File, WalletExtension...)}

* - *

For the store, you should use {@link org.bitcoinj.store.SPVBlockStore} or you could also try a - * {@link org.bitcoinj.store.MemoryBlockStore} if you want to hold all headers in RAM and don't care about + *

For the store, you should use {@link org.pivxj.store.SPVBlockStore} or you could also try a + * {@link org.pivxj.store.MemoryBlockStore} if you want to hold all headers in RAM and don't care about * disk serialization (this is rare).

*/ public BlockChain(Context context, Wallet wallet, BlockStore blockStore) throws BlockStoreException { diff --git a/core/src/main/java/org/bitcoinj/core/BloomFilter.java b/core/src/main/java/org/pivxj/core/BloomFilter.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/BloomFilter.java rename to core/src/main/java/org/pivxj/core/BloomFilter.java index 9f310a19b..1ae89c202 100644 --- a/core/src/main/java/org/bitcoinj/core/BloomFilter.java +++ b/core/src/main/java/org/pivxj/core/BloomFilter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptChunk; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptChunk; import com.google.common.base.Objects; import com.google.common.collect.Lists; @@ -103,7 +103,7 @@ public BloomFilter(int elements, double falsePositiveRate, long randomNonce) { * It should be a random value, however secureness of the random value is of no great consequence.

* *

updateFlag is used to control filter behaviour on the server (remote node) side when it encounters a hit. - * See {@link org.bitcoinj.core.BloomFilter.BloomUpdate} for a brief description of each mode. The purpose + * See {@link org.pivxj.core.BloomFilter.BloomUpdate} for a brief description of each mode. The purpose * of this flag is to reduce network round-tripping and avoid over-dirtying the filter for the most common * wallet configurations.

*/ @@ -268,7 +268,7 @@ public synchronized void merge(BloomFilter filter) { } /** - * Returns true if this filter will match anything. See {@link org.bitcoinj.core.BloomFilter#setMatchAll()} + * Returns true if this filter will match anything. See {@link org.pivxj.core.BloomFilter#setMatchAll()} * for when this can be a useful thing to do. */ public synchronized boolean matchesAll() { diff --git a/core/src/main/java/org/bitcoinj/core/BudgetManager.java b/core/src/main/java/org/pivxj/core/BudgetManager.java similarity index 83% rename from core/src/main/java/org/bitcoinj/core/BudgetManager.java rename to core/src/main/java/org/pivxj/core/BudgetManager.java index 1781d48b9..9a3d90caf 100644 --- a/core/src/main/java/org/bitcoinj/core/BudgetManager.java +++ b/core/src/main/java/org/pivxj/core/BudgetManager.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; /** * Created by Eric on 2/27/2016. diff --git a/core/src/main/java/org/bitcoinj/core/CheckpointManager.java b/core/src/main/java/org/pivxj/core/CheckpointManager.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/CheckpointManager.java rename to core/src/main/java/org/pivxj/core/CheckpointManager.java index a0369a3e5..0fec29b5c 100644 --- a/core/src/main/java/org/bitcoinj/core/CheckpointManager.java +++ b/core/src/main/java/org/pivxj/core/CheckpointManager.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.store.FullPrunedBlockStore; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; +import org.pivxj.store.FullPrunedBlockStore; import com.google.common.base.Charsets; import com.google.common.hash.HashCode; import com.google.common.hash.Hasher; @@ -55,7 +55,7 @@ * * *

Checkpoints are used by the SPV {@link BlockChain} to initialize fresh - * {@link org.bitcoinj.store.SPVBlockStore}s. They are not used by fully validating mode, which instead has a + * {@link org.pivxj.store.SPVBlockStore}s. They are not used by fully validating mode, which instead has a * different concept of checkpoints that are used to hard-code the validity of blocks that violate BIP30 (duplicate * coinbase transactions). Those "checkpoints" can be found in NetworkParameters.

* @@ -83,7 +83,7 @@ public class CheckpointManager { public static final BaseEncoding BASE64 = BaseEncoding.base64().omitPadding(); - /** Loads the default checkpoints bundled with bitcoinj */ + /** Loads the default checkpoints bundled with pivxj */ public CheckpointManager(Context context) throws IOException { this(context.getParams(), null); } @@ -106,7 +106,7 @@ else if (first == TEXTUAL_MAGIC.charAt(0)) throw new IOException("Unsupported format."); } - /** Returns a checkpoints stream pointing to inside the bitcoinj JAR */ + /** Returns a checkpoints stream pointing to inside the pivxj JAR */ public static InputStream openStream(NetworkParameters params) { return CheckpointManager.class.getResourceAsStream("/" + params.getId() + ".checkpoints.txt"); } diff --git a/core/src/main/java/org/bitcoinj/core/ChildMessage.java b/core/src/main/java/org/pivxj/core/ChildMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/ChildMessage.java rename to core/src/main/java/org/pivxj/core/ChildMessage.java index 87576d311..95454d936 100644 --- a/core/src/main/java/org/bitcoinj/core/ChildMessage.java +++ b/core/src/main/java/org/pivxj/core/ChildMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/core/Coin.java b/core/src/main/java/org/pivxj/core/Coin.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/Coin.java rename to core/src/main/java/org/pivxj/core/Coin.java index a4e4e53b5..35114a7fa 100644 --- a/core/src/main/java/org/bitcoinj/core/Coin.java +++ b/core/src/main/java/org/pivxj/core/Coin.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.utils.MonetaryFormat; +import org.pivxj.utils.MonetaryFormat; import com.google.common.math.LongMath; import com.google.common.primitives.Longs; diff --git a/core/src/main/java/org/bitcoinj/core/CoinDefinition.java b/core/src/main/java/org/pivxj/core/CoinDefinition.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/CoinDefinition.java rename to core/src/main/java/org/pivxj/core/CoinDefinition.java index 000dd915f..4a310a1d0 100644 --- a/core/src/main/java/org/bitcoinj/core/CoinDefinition.java +++ b/core/src/main/java/org/pivxj/core/CoinDefinition.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import java.math.BigInteger; import java.util.Map; diff --git a/core/src/main/java/org/bitcoinj/core/Context.java b/core/src/main/java/org/pivxj/core/Context.java similarity index 94% rename from core/src/main/java/org/bitcoinj/core/Context.java rename to core/src/main/java/org/pivxj/core/Context.java index d7404c42a..8a12e251d 100644 --- a/core/src/main/java/org/bitcoinj/core/Context.java +++ b/core/src/main/java/org/pivxj/core/Context.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.core.listeners.BlockChainListener; -import org.bitcoinj.store.FlatDB; -import org.bitcoinj.store.HashStore; -import org.bitcoinj.store.MasternodeDB; +import org.pivxj.core.listeners.BlockChainListener; +import org.pivxj.store.FlatDB; +import org.pivxj.store.HashStore; +import org.pivxj.store.MasternodeDB; import org.darkcoinj.DarkSendPool; import org.darkcoinj.InstantSend; import org.slf4j.*; @@ -37,7 +37,7 @@ /** *

The Context object holds various objects and pieces of configuration that are scoped to a specific instantiation of - * bitcoinj for a specific network. You can get an instance of this class through calling {@link #get()}.

+ * pivxj for a specific network. You can get an instance of this class through calling {@link #get()}.

* *

Context is new in 0.13 and the library is currently in a transitional period: you should create a Context that * wraps your chosen network parameters before using the rest of the library. However if you don't, things will still @@ -77,7 +77,7 @@ public class Context { * @param params The network parameters that will be associated with this context. */ public Context(NetworkParameters params) { - log.info("Creating bitcoinj {} context.", VersionMessage.BITCOINJ_VERSION); + log.info("Creating pivxj {} context.", VersionMessage.BITCOINJ_VERSION); this.confidenceTable = new TxConfidenceTable(); this.params = params; lastConstructed = this; @@ -110,7 +110,7 @@ public Context(NetworkParameters params, int eventHorizon, Coin feePerKb, boolea * object. This method returns that. Note that to help you develop, this method will also propagate whichever * context was created last onto the current thread, if it's missing. However it will print an error when doing so * because propagation of contexts is meant to be done manually: this is so two libraries or subsystems that - * independently use bitcoinj (or possibly alt coin forks of it) can operate correctly. + * independently use pivxj (or possibly alt coin forks of it) can operate correctly. * * @throws java.lang.IllegalStateException if no context exists at all or if we are in strict mode and there is no context. */ @@ -118,14 +118,14 @@ public static Context get() { Context tls = slot.get(); if (tls == null) { if (isStrictMode) { - log.error("Thread is missing a bitcoinj context."); + log.error("Thread is missing a pivxj context."); log.error("You should use Context.propagate() or a ContextPropagatingThreadFactory."); throw new IllegalStateException("missing context"); } if (lastConstructed == null) - throw new IllegalStateException("You must construct a Context object before using bitcoinj!"); + throw new IllegalStateException("You must construct a Context object before using pivxj!"); slot.set(lastConstructed); - log.error("Performing thread fixup: you are accessing bitcoinj via a thread that has not had any context set on it."); + log.error("Performing thread fixup: you are accessing pivxj via a thread that has not had any context set on it."); log.error("This error has been corrected for, but doing this makes your app less robust."); log.error("You should use Context.propagate() or a ContextPropagatingThreadFactory."); log.error("Please refer to the user guide for more information about this."); @@ -139,7 +139,7 @@ public static Context get() { } /** - * Require that new threads use {@link #propagate(Context)} or {@link org.bitcoinj.utils.ContextPropagatingThreadFactory}, + * Require that new threads use {@link #propagate(Context)} or {@link org.pivxj.utils.ContextPropagatingThreadFactory}, * rather than using a heuristic for the desired context. */ public static void enableStrictMode() { @@ -165,7 +165,7 @@ public static Context getOrCreate(NetworkParameters params) { * Sets the given context as the current thread context. You should use this if you create your own threads that * want to create core BitcoinJ objects. Generally, if a class can accept a Context in its constructor and might * be used (even indirectly) by a thread, you will want to call this first. Your task may be simplified by using - * a {@link org.bitcoinj.utils.ContextPropagatingThreadFactory}. + * a {@link org.pivxj.utils.ContextPropagatingThreadFactory}. */ public static void propagate(Context context) { slot.set(checkNotNull(context)); @@ -182,7 +182,7 @@ public TxConfidenceTable getConfidenceTable() { } /** - * Returns the {@link org.bitcoinj.core.NetworkParameters} specified when this context was (auto) created. The + * Returns the {@link org.pivxj.core.NetworkParameters} specified when this context was (auto) created. The * network parameters defines various hard coded constants for a specific instance of a Bitcoin network, such as * main net, testnet, etc. */ diff --git a/core/src/main/java/org/bitcoinj/core/DarkCoinSystem.java b/core/src/main/java/org/pivxj/core/DarkCoinSystem.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/DarkCoinSystem.java rename to core/src/main/java/org/pivxj/core/DarkCoinSystem.java index d33715d1a..999a7c457 100644 --- a/core/src/main/java/org/bitcoinj/core/DarkCoinSystem.java +++ b/core/src/main/java/org/pivxj/core/DarkCoinSystem.java @@ -1,6 +1,6 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.store.BlockStore; +import org.pivxj.store.BlockStore; import org.darkcoinj.DarkSend; import org.darkcoinj.InstantSend; diff --git a/core/src/main/java/org/bitcoinj/core/DarkSendElectionEntryMessage.java b/core/src/main/java/org/pivxj/core/DarkSendElectionEntryMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/DarkSendElectionEntryMessage.java rename to core/src/main/java/org/pivxj/core/DarkSendElectionEntryMessage.java index 44e29244a..44e4311f4 100644 --- a/core/src/main/java/org/bitcoinj/core/DarkSendElectionEntryMessage.java +++ b/core/src/main/java/org/pivxj/core/DarkSendElectionEntryMessage.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/DarkSendElectionEntryPingMessage.java b/core/src/main/java/org/pivxj/core/DarkSendElectionEntryPingMessage.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/DarkSendElectionEntryPingMessage.java rename to core/src/main/java/org/pivxj/core/DarkSendElectionEntryPingMessage.java index 8886abd9e..d54016d66 100644 --- a/core/src/main/java/org/bitcoinj/core/DarkSendElectionEntryPingMessage.java +++ b/core/src/main/java/org/pivxj/core/DarkSendElectionEntryPingMessage.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.OutputStream; -import static org.bitcoinj.core.Utils.int64ToByteStreamLE; +import static org.pivxj.core.Utils.int64ToByteStreamLE; /** * Created by Eric on 2/10/2015. diff --git a/core/src/main/java/org/bitcoinj/core/DarkSendEntryGetMessage.java b/core/src/main/java/org/pivxj/core/DarkSendEntryGetMessage.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/DarkSendEntryGetMessage.java rename to core/src/main/java/org/pivxj/core/DarkSendEntryGetMessage.java index f2fd54624..98a9e7307 100644 --- a/core/src/main/java/org/bitcoinj/core/DarkSendEntryGetMessage.java +++ b/core/src/main/java/org/pivxj/core/DarkSendEntryGetMessage.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/DarkSendQueue.java b/core/src/main/java/org/pivxj/core/DarkSendQueue.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/DarkSendQueue.java rename to core/src/main/java/org/pivxj/core/DarkSendQueue.java index d19abaa96..459581b5d 100644 --- a/core/src/main/java/org/bitcoinj/core/DarkSendQueue.java +++ b/core/src/main/java/org/pivxj/core/DarkSendQueue.java @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.darkcoinj.DarkSend; -import org.darkcoinj.DarkSendSigner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,8 +22,8 @@ import java.io.OutputStream; import java.io.Serializable; -import static org.bitcoinj.core.Utils.int64ToByteStreamLE; -import static org.bitcoinj.core.Utils.uint32ToByteStreamLE; +import static org.pivxj.core.Utils.int64ToByteStreamLE; +import static org.pivxj.core.Utils.uint32ToByteStreamLE; public class DarkSendQueue extends Message implements Serializable { diff --git a/core/src/main/java/org/bitcoinj/core/DummySerializer.java b/core/src/main/java/org/pivxj/core/DummySerializer.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/DummySerializer.java rename to core/src/main/java/org/pivxj/core/DummySerializer.java index 68121e705..b9684be0b 100644 --- a/core/src/main/java/org/bitcoinj/core/DummySerializer.java +++ b/core/src/main/java/org/pivxj/core/DummySerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java b/core/src/main/java/org/pivxj/core/DumpedPrivateKey.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java rename to core/src/main/java/org/pivxj/core/DumpedPrivateKey.java index 7c9895c24..b5e834b4e 100644 --- a/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java +++ b/core/src/main/java/org/pivxj/core/DumpedPrivateKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; import com.google.common.base.Preconditions; diff --git a/core/src/main/java/org/bitcoinj/core/ECKey.java b/core/src/main/java/org/pivxj/core/ECKey.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/ECKey.java rename to core/src/main/java/org/pivxj/core/ECKey.java index e504f8975..8a68e79bf 100644 --- a/core/src/main/java/org/bitcoinj/core/ECKey.java +++ b/core/src/main/java/org/pivxj/core/ECKey.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.crypto.*; +import org.pivxj.crypto.*; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @@ -28,8 +28,8 @@ import org.bitcoin.NativeSecp256k1; import org.bitcoin.NativeSecp256k1Util; import org.bitcoin.Secp256k1Context; -import org.bitcoinj.wallet.Protos; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.wallet.Protos; +import org.pivxj.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.asn1.*; @@ -420,7 +420,7 @@ public boolean isWatching() { /** * Output this ECKey as an ASN.1 encoded private key, as understood by OpenSSL or used by Bitcoin Core * in its wallet storage format. - * @throws org.bitcoinj.core.ECKey.MissingPrivateKeyException if the private key is missing or encrypted. + * @throws org.pivxj.core.ECKey.MissingPrivateKeyException if the private key is missing or encrypted. */ public byte[] toASN1() { try { @@ -625,7 +625,7 @@ public int hashCode() { /** * Signs the given hash and returns the R and S components as BigIntegers. In the Bitcoin protocol, they are - * usually encoded using ASN.1 format, so you want {@link org.bitcoinj.core.ECKey.ECDSASignature#toASN1()} + * usually encoded using ASN.1 format, so you want {@link org.pivxj.core.ECKey.ECDSASignature#toASN1()} * instead. However sometimes the independent components can be useful, for instance, if you're going to do * further EC maths on them. * @throws KeyCrypterException if this ECKey doesn't have a private part. @@ -644,7 +644,7 @@ public ECDSASignature sign(Sha256Hash input) throws KeyCrypterException { /** * Signs the given hash and returns the R and S components as BigIntegers. In the Bitcoin protocol, they are - * usually encoded using DER format, so you want {@link org.bitcoinj.core.ECKey.ECDSASignature#encodeToDER()} + * usually encoded using DER format, so you want {@link org.pivxj.core.ECKey.ECDSASignature#encodeToDER()} * instead. However sometimes the independent components can be useful, for instance, if you're doing to do further * EC maths on them. * @@ -1053,7 +1053,7 @@ private static ECPoint decompressKey(BigInteger xBN, boolean yBit) { /** * Returns a 32 byte array containing the private key. - * @throws org.bitcoinj.core.ECKey.MissingPrivateKeyException if the private key bytes are missing/encrypted. + * @throws org.pivxj.core.ECKey.MissingPrivateKeyException if the private key bytes are missing/encrypted. */ public byte[] getPrivKeyBytes() { return Utils.bigIntegerToBytes(getPrivKey(), 32); @@ -1061,7 +1061,7 @@ public byte[] getPrivKeyBytes() { /** * Exports the private key in the form used by Bitcoin Core's "dumpprivkey" and "importprivkey" commands. Use - * the {@link org.bitcoinj.core.DumpedPrivateKey#toString()} method to get the string. + * the {@link org.pivxj.core.DumpedPrivateKey#toString()} method to get the string. * * @param params The network this key is intended for use on. * @return Private key bytes as a {@link DumpedPrivateKey}. diff --git a/core/src/main/java/org/bitcoinj/core/EmptyMessage.java b/core/src/main/java/org/pivxj/core/EmptyMessage.java similarity index 93% rename from core/src/main/java/org/bitcoinj/core/EmptyMessage.java rename to core/src/main/java/org/pivxj/core/EmptyMessage.java index 981ad4065..161cb59f6 100644 --- a/core/src/main/java/org/bitcoinj/core/EmptyMessage.java +++ b/core/src/main/java/org/pivxj/core/EmptyMessage.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; /** *

Parent class for header only messages that don't have a payload. - * Currently this includes getaddr, verack and special bitcoinj class UnknownMessage.

+ * Currently this includes getaddr, verack and special pivxj class UnknownMessage.

* *

Instances of this class are not safe for use by multiple threads.

*/ diff --git a/core/src/main/java/org/bitcoinj/core/FilteredBlock.java b/core/src/main/java/org/pivxj/core/FilteredBlock.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/FilteredBlock.java rename to core/src/main/java/org/pivxj/core/FilteredBlock.java index 84969e03c..e291f85a9 100644 --- a/core/src/main/java/org/bitcoinj/core/FilteredBlock.java +++ b/core/src/main/java/org/pivxj/core/FilteredBlock.java @@ -15,10 +15,9 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; -import org.spongycastle.util.encoders.Hex; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java b/core/src/main/java/org/pivxj/core/FullPrunedBlockChain.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java rename to core/src/main/java/org/pivxj/core/FullPrunedBlockChain.java index 4bdebbce2..496d2b709 100644 --- a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java +++ b/core/src/main/java/org/pivxj/core/FullPrunedBlockChain.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.bitcoinj.core; - -import org.bitcoinj.script.Script; -import org.bitcoinj.script.Script.VerifyFlag; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.store.FullPrunedBlockStore; -import org.bitcoinj.utils.*; -import org.bitcoinj.wallet.Wallet; +package org.pivxj.core; + +import org.pivxj.script.Script; +import org.pivxj.script.Script.VerifyFlag; +import org.pivxj.store.BlockStoreException; +import org.pivxj.store.FullPrunedBlockStore; +import org.pivxj.utils.*; +import org.pivxj.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/GetAddrMessage.java b/core/src/main/java/org/pivxj/core/GetAddrMessage.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/GetAddrMessage.java rename to core/src/main/java/org/pivxj/core/GetAddrMessage.java index 691465691..01b46b404 100644 --- a/core/src/main/java/org/bitcoinj/core/GetAddrMessage.java +++ b/core/src/main/java/org/pivxj/core/GetAddrMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** *

Represents the "getaddr" P2P protocol message, which requests network {@link AddressMessage}s from a peer. Not to diff --git a/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java b/core/src/main/java/org/pivxj/core/GetBlocksMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java rename to core/src/main/java/org/pivxj/core/GetBlocksMessage.java index 4a1bcedb6..d4f273bc4 100644 --- a/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java +++ b/core/src/main/java/org/pivxj/core/GetBlocksMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/GetDataMessage.java b/core/src/main/java/org/pivxj/core/GetDataMessage.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/GetDataMessage.java rename to core/src/main/java/org/pivxj/core/GetDataMessage.java index 09442b1e9..375fb5191 100644 --- a/core/src/main/java/org/bitcoinj/core/GetDataMessage.java +++ b/core/src/main/java/org/pivxj/core/GetDataMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** *

Represents the "getdata" P2P network message, which requests the contents of blocks or transactions given their diff --git a/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java b/core/src/main/java/org/pivxj/core/GetHeadersMessage.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java rename to core/src/main/java/org/pivxj/core/GetHeadersMessage.java index 2302c5ca9..54cabd830 100644 --- a/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java +++ b/core/src/main/java/org/pivxj/core/GetHeadersMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/core/GetMasternodePaymentRequestSyncMessage.java b/core/src/main/java/org/pivxj/core/GetMasternodePaymentRequestSyncMessage.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/GetMasternodePaymentRequestSyncMessage.java rename to core/src/main/java/org/pivxj/core/GetMasternodePaymentRequestSyncMessage.java index 82a68115f..416d118cc 100644 --- a/core/src/main/java/org/bitcoinj/core/GetMasternodePaymentRequestSyncMessage.java +++ b/core/src/main/java/org/pivxj/core/GetMasternodePaymentRequestSyncMessage.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/GetMasternodeVoteSyncMessage.java b/core/src/main/java/org/pivxj/core/GetMasternodeVoteSyncMessage.java similarity index 94% rename from core/src/main/java/org/bitcoinj/core/GetMasternodeVoteSyncMessage.java rename to core/src/main/java/org/pivxj/core/GetMasternodeVoteSyncMessage.java index d238a70c5..ec6dbf9d3 100644 --- a/core/src/main/java/org/bitcoinj/core/GetMasternodeVoteSyncMessage.java +++ b/core/src/main/java/org/pivxj/core/GetMasternodeVoteSyncMessage.java @@ -1,6 +1,5 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/GetSporksMessage.java b/core/src/main/java/org/pivxj/core/GetSporksMessage.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/GetSporksMessage.java rename to core/src/main/java/org/pivxj/core/GetSporksMessage.java index 22b7bc6bb..5d72221a5 100644 --- a/core/src/main/java/org/bitcoinj/core/GetSporksMessage.java +++ b/core/src/main/java/org/pivxj/core/GetSporksMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** * Represents the "getaddr" P2P protocol message, which requests network {@link AddressMessage}s from a peer. Not to diff --git a/core/src/main/java/org/bitcoinj/core/GetUTXOsMessage.java b/core/src/main/java/org/pivxj/core/GetUTXOsMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/GetUTXOsMessage.java rename to core/src/main/java/org/pivxj/core/GetUTXOsMessage.java index 200a24129..ec7fae041 100644 --- a/core/src/main/java/org/bitcoinj/core/GetUTXOsMessage.java +++ b/core/src/main/java/org/pivxj/core/GetUTXOsMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/core/src/main/java/org/bitcoinj/core/GovernanceSyncMessage.java b/core/src/main/java/org/pivxj/core/GovernanceSyncMessage.java similarity index 91% rename from core/src/main/java/org/bitcoinj/core/GovernanceSyncMessage.java rename to core/src/main/java/org/pivxj/core/GovernanceSyncMessage.java index 87cd2993a..003be8c66 100644 --- a/core/src/main/java/org/bitcoinj/core/GovernanceSyncMessage.java +++ b/core/src/main/java/org/pivxj/core/GovernanceSyncMessage.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; /** * Created by Eric on 2/12/2017. diff --git a/core/src/main/java/org/bitcoinj/core/HeadersMessage.java b/core/src/main/java/org/pivxj/core/HeadersMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/HeadersMessage.java rename to core/src/main/java/org/pivxj/core/HeadersMessage.java index 0c899c8b0..1a0bfdaeb 100644 --- a/core/src/main/java/org/bitcoinj/core/HeadersMessage.java +++ b/core/src/main/java/org/pivxj/core/HeadersMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/InsufficientMoneyException.java b/core/src/main/java/org/pivxj/core/InsufficientMoneyException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/InsufficientMoneyException.java rename to core/src/main/java/org/pivxj/core/InsufficientMoneyException.java index ad8490c8c..755fe7321 100644 --- a/core/src/main/java/org/bitcoinj/core/InsufficientMoneyException.java +++ b/core/src/main/java/org/pivxj/core/InsufficientMoneyException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/core/InventoryItem.java b/core/src/main/java/org/pivxj/core/InventoryItem.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/InventoryItem.java rename to core/src/main/java/org/pivxj/core/InventoryItem.java index c896da3a1..40febd644 100644 --- a/core/src/main/java/org/bitcoinj/core/InventoryItem.java +++ b/core/src/main/java/org/pivxj/core/InventoryItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; diff --git a/core/src/main/java/org/bitcoinj/core/InventoryMessage.java b/core/src/main/java/org/pivxj/core/InventoryMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/InventoryMessage.java rename to core/src/main/java/org/pivxj/core/InventoryMessage.java index 1660dd7c3..65bcc032e 100644 --- a/core/src/main/java/org/bitcoinj/core/InventoryMessage.java +++ b/core/src/main/java/org/pivxj/core/InventoryMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import static com.google.common.base.Preconditions.checkArgument; diff --git a/core/src/main/java/org/bitcoinj/core/ListMessage.java b/core/src/main/java/org/pivxj/core/ListMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/ListMessage.java rename to core/src/main/java/org/pivxj/core/ListMessage.java index 68dd55de6..cd50c3f38 100644 --- a/core/src/main/java/org/bitcoinj/core/ListMessage.java +++ b/core/src/main/java/org/pivxj/core/ListMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/MasterNodePaymentWinner.java b/core/src/main/java/org/pivxj/core/MasterNodePaymentWinner.java similarity index 94% rename from core/src/main/java/org/bitcoinj/core/MasterNodePaymentWinner.java rename to core/src/main/java/org/pivxj/core/MasterNodePaymentWinner.java index ec7b0d716..bf5d9edf4 100644 --- a/core/src/main/java/org/bitcoinj/core/MasterNodePaymentWinner.java +++ b/core/src/main/java/org/pivxj/core/MasterNodePaymentWinner.java @@ -1,11 +1,11 @@ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; -import static org.bitcoinj.core.Utils.int64ToByteStreamLE; -import static org.bitcoinj.core.Utils.uint32ToByteStreamLE; +import static org.pivxj.core.Utils.int64ToByteStreamLE; +import static org.pivxj.core.Utils.uint32ToByteStreamLE; /** * Created by Eric on 2/8/2015. diff --git a/core/src/main/java/org/bitcoinj/core/MasterNodeSystem.java b/core/src/main/java/org/pivxj/core/MasterNodeSystem.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/MasterNodeSystem.java rename to core/src/main/java/org/pivxj/core/MasterNodeSystem.java index a2a7392fa..205840af7 100644 --- a/core/src/main/java/org/bitcoinj/core/MasterNodeSystem.java +++ b/core/src/main/java/org/pivxj/core/MasterNodeSystem.java @@ -1,9 +1,6 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; import org.darkcoinj.ActiveMasterNode; -import org.darkcoinj.DarkSendSigner; import org.darkcoinj.MasterNodePayments; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/MasterNodeVote.java b/core/src/main/java/org/pivxj/core/MasterNodeVote.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/MasterNodeVote.java rename to core/src/main/java/org/pivxj/core/MasterNodeVote.java index 768dee3f6..2743f2465 100644 --- a/core/src/main/java/org/bitcoinj/core/MasterNodeVote.java +++ b/core/src/main/java/org/pivxj/core/MasterNodeVote.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.Script; +import org.pivxj.script.Script; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; -import static org.bitcoinj.core.Utils.int64ToByteStreamLE; -import static org.bitcoinj.core.Utils.uint32ToByteStreamLE; +import static org.pivxj.core.Utils.int64ToByteStreamLE; +import static org.pivxj.core.Utils.uint32ToByteStreamLE; public class MasterNodeVote extends ChildMessage implements Serializable { public int votes; diff --git a/core/src/main/java/org/bitcoinj/core/Masternode.java b/core/src/main/java/org/pivxj/core/Masternode.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/Masternode.java rename to core/src/main/java/org/pivxj/core/Masternode.java index e68ec581b..602596bd1 100644 --- a/core/src/main/java/org/bitcoinj/core/Masternode.java +++ b/core/src/main/java/org/pivxj/core/Masternode.java @@ -1,6 +1,6 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.utils.Threading; +import org.pivxj.utils.Threading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +11,7 @@ import java.util.Map; import java.util.concurrent.locks.ReentrantLock; -import static org.bitcoinj.core.MasterNodeSystem.MASTERNODE_REMOVAL_SECONDS; +import static org.pivxj.core.MasterNodeSystem.MASTERNODE_REMOVAL_SECONDS; /** * Created by Eric on 2/8/2015. diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeAddress.java b/core/src/main/java/org/pivxj/core/MasternodeAddress.java similarity index 94% rename from core/src/main/java/org/bitcoinj/core/MasternodeAddress.java rename to core/src/main/java/org/pivxj/core/MasternodeAddress.java index 098be481a..174353a96 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeAddress.java +++ b/core/src/main/java/org/pivxj/core/MasternodeAddress.java @@ -14,21 +14,17 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.net.InetAddresses; -import org.bitcoinj.params.MainNetParams; +import org.pivxj.params.MainNetParams; import java.io.IOException; import java.io.OutputStream; -import java.math.BigInteger; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.UnknownHostException; import static com.google.common.base.Preconditions.checkNotNull; -import static org.bitcoinj.core.Utils.uint32ToByteStreamLE; -import static org.bitcoinj.core.Utils.uint64ToByteStreamLE; /** * A PeerAddress holds an IP address and port number representing the network location of diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeBroadcast.java b/core/src/main/java/org/pivxj/core/MasternodeBroadcast.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/MasternodeBroadcast.java rename to core/src/main/java/org/pivxj/core/MasternodeBroadcast.java index a7c0a9e73..99739dacb 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeBroadcast.java +++ b/core/src/main/java/org/pivxj/core/MasternodeBroadcast.java @@ -1,7 +1,7 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; import org.darkcoinj.DarkSendSigner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeInfo.java b/core/src/main/java/org/pivxj/core/MasternodeInfo.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/MasternodeInfo.java rename to core/src/main/java/org/pivxj/core/MasternodeInfo.java index d801b9a8c..6c1c7b31a 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeInfo.java +++ b/core/src/main/java/org/pivxj/core/MasternodeInfo.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; /** * Created by Eric on 2/8/2017. diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeManager.java b/core/src/main/java/org/pivxj/core/MasternodeManager.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/MasternodeManager.java rename to core/src/main/java/org/pivxj/core/MasternodeManager.java index 61b93d49d..f470069ec 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeManager.java +++ b/core/src/main/java/org/pivxj/core/MasternodeManager.java @@ -1,12 +1,12 @@ -package org.bitcoinj.core; - -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.utils.ListenerRegistration; -import org.bitcoinj.utils.Pair; -import org.bitcoinj.utils.Threading; +package org.pivxj.core; + +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; +import org.pivxj.utils.ListenerRegistration; +import org.pivxj.utils.Pair; +import org.pivxj.utils.Threading; import org.darkcoinj.DarkSendSigner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +19,7 @@ import java.util.concurrent.locks.ReentrantLock; import static com.google.common.base.Preconditions.checkState; -import static org.bitcoinj.core.MasterNodeSystem.MASTERNODE_REMOVAL_SECONDS; +import static org.pivxj.core.MasterNodeSystem.MASTERNODE_REMOVAL_SECONDS; /** * Created by Hash Engineering on 2/20/2016. diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeManagerListener.java b/core/src/main/java/org/pivxj/core/MasternodeManagerListener.java similarity index 84% rename from core/src/main/java/org/bitcoinj/core/MasternodeManagerListener.java rename to core/src/main/java/org/pivxj/core/MasternodeManagerListener.java index 34cf1e280..cfb1e62c5 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeManagerListener.java +++ b/core/src/main/java/org/pivxj/core/MasternodeManagerListener.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; /** * Created by Hash Engineering on 5/14/2016. diff --git a/core/src/main/java/org/bitcoinj/core/MasternodePayments.java b/core/src/main/java/org/pivxj/core/MasternodePayments.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/MasternodePayments.java rename to core/src/main/java/org/pivxj/core/MasternodePayments.java index b45aedff8..03e06cf4c 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodePayments.java +++ b/core/src/main/java/org/pivxj/core/MasternodePayments.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; /** * Created by Eric on 2/21/2016. diff --git a/core/src/main/java/org/bitcoinj/core/MasternodePing.java b/core/src/main/java/org/pivxj/core/MasternodePing.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/MasternodePing.java rename to core/src/main/java/org/pivxj/core/MasternodePing.java index ea6910fb7..3b33a9737 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodePing.java +++ b/core/src/main/java/org/pivxj/core/MasternodePing.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.store.BlockStoreException; +import org.pivxj.store.BlockStoreException; import org.darkcoinj.DarkSendSigner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +25,7 @@ import java.io.Serializable; import static com.hashengineering.crypto.X11.x11Digest; -import static org.bitcoinj.core.Utils.int64ToByteStreamLE; +import static org.pivxj.core.Utils.int64ToByteStreamLE; public class MasternodePing extends Message implements Serializable { diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeSignature.java b/core/src/main/java/org/pivxj/core/MasternodeSignature.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/MasternodeSignature.java rename to core/src/main/java/org/pivxj/core/MasternodeSignature.java index 2da2c0681..1fd3eefa2 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeSignature.java +++ b/core/src/main/java/org/pivxj/core/MasternodeSignature.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeSync.java b/core/src/main/java/org/pivxj/core/MasternodeSync.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/MasternodeSync.java rename to core/src/main/java/org/pivxj/core/MasternodeSync.java index 67d4a7547..47e84e071 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeSync.java +++ b/core/src/main/java/org/pivxj/core/MasternodeSync.java @@ -1,11 +1,10 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.utils.ListenerRegistration; -import org.bitcoinj.utils.Threading; +import org.pivxj.utils.ListenerRegistration; +import org.pivxj.utils.Threading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; import java.util.HashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; diff --git a/core/src/main/java/org/bitcoinj/core/MasternodeSyncListener.java b/core/src/main/java/org/pivxj/core/MasternodeSyncListener.java similarity index 85% rename from core/src/main/java/org/bitcoinj/core/MasternodeSyncListener.java rename to core/src/main/java/org/pivxj/core/MasternodeSyncListener.java index 9bb532520..5e58d5791 100644 --- a/core/src/main/java/org/bitcoinj/core/MasternodeSyncListener.java +++ b/core/src/main/java/org/pivxj/core/MasternodeSyncListener.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; /** * Created by Hash Engineering on 2/28/2016. diff --git a/core/src/main/java/org/bitcoinj/core/MemoryPoolMessage.java b/core/src/main/java/org/pivxj/core/MemoryPoolMessage.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/MemoryPoolMessage.java rename to core/src/main/java/org/pivxj/core/MemoryPoolMessage.java index 81171d864..7bd7ab725 100644 --- a/core/src/main/java/org/bitcoinj/core/MemoryPoolMessage.java +++ b/core/src/main/java/org/pivxj/core/MemoryPoolMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/Message.java b/core/src/main/java/org/pivxj/core/Message.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/Message.java rename to core/src/main/java/org/pivxj/core/Message.java index 3e133cd79..965a528df 100644 --- a/core/src/main/java/org/bitcoinj/core/Message.java +++ b/core/src/main/java/org/pivxj/core/Message.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/MessageSerializer.java b/core/src/main/java/org/pivxj/core/MessageSerializer.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/MessageSerializer.java rename to core/src/main/java/org/pivxj/core/MessageSerializer.java index 2e962eef2..6dcf95b74 100644 --- a/core/src/main/java/org/bitcoinj/core/MessageSerializer.java +++ b/core/src/main/java/org/pivxj/core/MessageSerializer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/Monetary.java b/core/src/main/java/org/pivxj/core/Monetary.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/Monetary.java rename to core/src/main/java/org/pivxj/core/Monetary.java index 9f94ec211..44fa6e3c4 100644 --- a/core/src/main/java/org/bitcoinj/core/Monetary.java +++ b/core/src/main/java/org/pivxj/core/Monetary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.Serializable; diff --git a/core/src/main/java/org/bitcoinj/core/NetAddress.java b/core/src/main/java/org/pivxj/core/NetAddress.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/NetAddress.java rename to core/src/main/java/org/pivxj/core/NetAddress.java index 4e9bdbbd6..2dca07843 100644 --- a/core/src/main/java/org/bitcoinj/core/NetAddress.java +++ b/core/src/main/java/org/pivxj/core/NetAddress.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.net.InetAddresses; -import org.bitcoinj.params.MainNetParams; import java.io.IOException; import java.io.OutputStream; import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java b/core/src/main/java/org/pivxj/core/NetworkParameters.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/NetworkParameters.java rename to core/src/main/java/org/pivxj/core/NetworkParameters.java index ea5ad85fe..fc42ae5c5 100644 --- a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java +++ b/core/src/main/java/org/pivxj/core/NetworkParameters.java @@ -15,28 +15,27 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; -import org.bitcoinj.net.discovery.HttpDiscovery; -import org.bitcoinj.params.*; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.bitcoinj.script.ScriptChunk; -import org.bitcoinj.script.ScriptOpCodes; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.utils.MonetaryFormat; +import org.pivxj.net.discovery.HttpDiscovery; +import org.pivxj.params.*; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; +import org.pivxj.script.ScriptChunk; +import org.pivxj.script.ScriptOpCodes; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; +import org.pivxj.utils.MonetaryFormat; import javax.annotation.Nullable; -import java.io.ByteArrayOutputStream; import java.math.BigInteger; import java.util.HashMap; import java.util.Map; import java.util.EnumSet; -import static org.bitcoinj.core.Coin.*; -import org.bitcoinj.utils.VersionTally; +import static org.pivxj.core.Coin.*; +import org.pivxj.utils.VersionTally; /** *

NetworkParameters contains the data needed for working with an instantiation of a Bitcoin chain.

@@ -317,7 +316,7 @@ public int[] getAddrSeeds() { return addrSeeds; } - /** Returns discovery objects for seeds implementing the Cartographer protocol. See {@link org.bitcoinj.net.discovery.HttpDiscovery} for more info. */ + /** Returns discovery objects for seeds implementing the Cartographer protocol. See {@link org.pivxj.net.discovery.HttpDiscovery} for more info. */ public HttpDiscovery.Details[] getHttpSeeds() { return httpSeeds; } @@ -348,7 +347,7 @@ public long getPacketMagic() { } /** - * First byte of a base58 encoded address. See {@link org.bitcoinj.core.Address}. This is the same as acceptableAddressCodes[0] and + * First byte of a base58 encoded address. See {@link org.pivxj.core.Address}. This is the same as acceptableAddressCodes[0] and * is the one used for "normal" addresses. Other types of address may be encountered with version codes found in * the acceptableAddressCodes array. */ @@ -363,7 +362,7 @@ public int getP2SHHeader() { return p2shHeader; } - /** First byte of a base58 encoded dumped private key. See {@link org.bitcoinj.core.DumpedPrivateKey}. */ + /** First byte of a base58 encoded dumped private key. See {@link org.pivxj.core.DumpedPrivateKey}. */ public int getDumpedPrivateKeyHeader() { return dumpedPrivateKeyHeader; } @@ -404,7 +403,7 @@ public BigInteger getMaxTarget() { } /** - * The key used to sign {@link org.bitcoinj.core.AlertMessage}s. You can use {@link org.bitcoinj.core.ECKey#verify(byte[], byte[], byte[])} to verify + * The key used to sign {@link org.pivxj.core.AlertMessage}s. You can use {@link org.pivxj.core.ECKey#verify(byte[], byte[], byte[])} to verify * signatures using it. */ public byte[] getAlertSigningKey() { diff --git a/core/src/main/java/org/bitcoinj/core/NotFoundMessage.java b/core/src/main/java/org/pivxj/core/NotFoundMessage.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/NotFoundMessage.java rename to core/src/main/java/org/pivxj/core/NotFoundMessage.java index bf9c77ae1..2f9b669c4 100644 --- a/core/src/main/java/org/bitcoinj/core/NotFoundMessage.java +++ b/core/src/main/java/org/pivxj/core/NotFoundMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java b/core/src/main/java/org/pivxj/core/PartialMerkleTree.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java rename to core/src/main/java/org/pivxj/core/PartialMerkleTree.java index 832e1b75c..641a9c837 100644 --- a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java +++ b/core/src/main/java/org/pivxj/core/PartialMerkleTree.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.List; -import static org.bitcoinj.core.Utils.*; +import static org.pivxj.core.Utils.*; import com.google.common.base.Objects; /** diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/pivxj/core/Peer.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/Peer.java rename to core/src/main/java/org/pivxj/core/Peer.java index 043a88677..6759370cb 100644 --- a/core/src/main/java/org/bitcoinj/core/Peer.java +++ b/core/src/main/java/org/pivxj/core/Peer.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import org.bitcoinj.core.listeners.*; -import org.bitcoinj.net.StreamConnection; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.utils.ListenerRegistration; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.listeners.*; +import org.pivxj.net.StreamConnection; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; +import org.pivxj.utils.ListenerRegistration; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.Wallet; import com.google.common.collect.Lists; import com.google.common.util.concurrent.FutureCallback; @@ -53,8 +53,8 @@ * handles low-level message (de)serialization.

* *

Note that timeouts are handled by the extended - * {@link org.bitcoinj.net.AbstractTimeoutHandler} and timeout is automatically disabled (using - * {@link org.bitcoinj.net.AbstractTimeoutHandler#setTimeoutEnabled(boolean)}) once the version + * {@link org.pivxj.net.AbstractTimeoutHandler} and timeout is automatically disabled (using + * {@link org.pivxj.net.AbstractTimeoutHandler#setTimeoutEnabled(boolean)}) once the version * handshake completes.

*/ public class Peer extends PeerSocketHandler { @@ -181,9 +181,9 @@ public Peer apply(@Nullable List peers) { * *

Note that this does NOT make a connection to the given remoteAddress, it only creates a handler for a * connection. If you want to create a one-off connection, create a Peer and pass it to - * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} + * {@link org.pivxj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} * or - * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

+ * {@link org.pivxj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

* *

The remoteAddress provided should match the remote address of the peer which is being connected to, and is * used to keep track of which peers relayed transactions and offer more descriptive logging.

@@ -193,15 +193,15 @@ public Peer(NetworkParameters params, VersionMessage ver, @Nullable AbstractBloc } /** - *

Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link org.bitcoinj.core.TxConfidenceTable} + *

Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link org.pivxj.core.TxConfidenceTable} * will have their confidence levels updated when a peer announces it, to reflect the greater likelyhood that * the transaction is valid.

* *

Note that this does NOT make a connection to the given remoteAddress, it only creates a handler for a * connection. If you want to create a one-off connection, create a Peer and pass it to - * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} + * {@link org.pivxj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} * or - * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

+ * {@link org.pivxj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

* *

The remoteAddress provided should match the remote address of the peer which is being connected to, and is * used to keep track of which peers relayed transactions and offer more descriptive logging.

@@ -212,15 +212,15 @@ public Peer(NetworkParameters params, VersionMessage ver, PeerAddress remoteAddr } /** - *

Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link org.bitcoinj.core.TxConfidenceTable} + *

Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link org.pivxj.core.TxConfidenceTable} * will have their confidence levels updated when a peer announces it, to reflect the greater likelyhood that * the transaction is valid.

* *

Note that this does NOT make a connection to the given remoteAddress, it only creates a handler for a * connection. If you want to create a one-off connection, create a Peer and pass it to - * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} + * {@link org.pivxj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} * or - * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

+ * {@link org.pivxj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

* *

The remoteAddress provided should match the remote address of the peer which is being connected to, and is * used to keep track of which peers relayed transactions and offer more descriptive logging.

@@ -256,9 +256,9 @@ public void run() { * *

Note that this does NOT make a connection to the given remoteAddress, it only creates a handler for a * connection. If you want to create a one-off connection, create a Peer and pass it to - * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} + * {@link org.pivxj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)} * or - * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

+ * {@link org.pivxj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.

* *

The remoteAddress provided should match the remote address of the peer which is being connected to, and is * used to keep track of which peers relayed transactions and offer more descriptive logging.

@@ -618,7 +618,7 @@ private void processVersionMessage(VersionMessage m) throws ProtocolException { vPeerVersionMessage.localServices, String.format(Locale.US, "%tF %tT", peerTime, peerTime), vPeerVersionMessage.bestHeight); - // bitcoinj is a client mode implementation. That means there's not much point in us talking to other client + // pivxj is a client mode implementation. That means there's not much point in us talking to other client // mode nodes because we can't download the data from them we need to find/verify transactions. Some bogus // implementations claim to have a block chain in their services field but then report a height of zero, filter // them out here. @@ -1821,7 +1821,7 @@ private void addPingTimeData(long sample) { /** * Sends the peer a ping message and returns a future that will be invoked when the pong is received back. * The future provides a number which is the number of milliseconds elapsed between the ping and the pong. - * Once the pong is received the value returned by {@link org.bitcoinj.core.Peer#getLastPingTime()} is + * Once the pong is received the value returned by {@link org.pivxj.core.Peer#getLastPingTime()} is * updated. * @throws ProtocolException if the peer version is too low to support measurable pings. */ @@ -1840,7 +1840,7 @@ protected ListenableFuture ping(long nonce) throws ProtocolException { } /** - * Returns the elapsed time of the last ping/pong cycle. If {@link org.bitcoinj.core.Peer#ping()} has never + * Returns the elapsed time of the last ping/pong cycle. If {@link org.pivxj.core.Peer#ping()} has never * been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}. */ public long getLastPingTime() { @@ -1855,7 +1855,7 @@ public long getLastPingTime() { } /** - * Returns a moving average of the last N ping/pong cycles. If {@link org.bitcoinj.core.Peer#ping()} has never + * Returns a moving average of the last N ping/pong cycles. If {@link org.pivxj.core.Peer#ping()} has never * been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}. The moving average * window is 5 buckets. */ diff --git a/core/src/main/java/org/bitcoinj/core/PeerAddress.java b/core/src/main/java/org/pivxj/core/PeerAddress.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/PeerAddress.java rename to core/src/main/java/org/pivxj/core/PeerAddress.java index 7d5017ca3..822ef1a98 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerAddress.java +++ b/core/src/main/java/org/pivxj/core/PeerAddress.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.params.MainNetParams; +import org.pivxj.params.MainNetParams; import com.google.common.base.Objects; import com.google.common.net.InetAddresses; @@ -28,8 +28,8 @@ import java.net.InetSocketAddress; import java.net.UnknownHostException; -import static org.bitcoinj.core.Utils.uint32ToByteStreamLE; -import static org.bitcoinj.core.Utils.uint64ToByteStreamLE; +import static org.pivxj.core.Utils.uint32ToByteStreamLE; +import static org.pivxj.core.Utils.uint64ToByteStreamLE; import static com.google.common.base.Preconditions.checkNotNull; /** diff --git a/core/src/main/java/org/bitcoinj/core/PeerException.java b/core/src/main/java/org/pivxj/core/PeerException.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/PeerException.java rename to core/src/main/java/org/pivxj/core/PeerException.java index 715448bce..fcb0ed492 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerException.java +++ b/core/src/main/java/org/pivxj/core/PeerException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** * Thrown when a problem occurs in communicating with a peer, and we should diff --git a/core/src/main/java/org/bitcoinj/core/PeerFilterProvider.java b/core/src/main/java/org/pivxj/core/PeerFilterProvider.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/PeerFilterProvider.java rename to core/src/main/java/org/pivxj/core/PeerFilterProvider.java index ebc72076d..e2f54177c 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerFilterProvider.java +++ b/core/src/main/java/org/pivxj/core/PeerFilterProvider.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** * An interface which provides the information required to properly filter data downloaded from Peers. - * Note that an implementer is responsible for calling {@link PeerGroup#recalculateFastCatchupAndFilter(org.bitcoinj.core.PeerGroup.FilterRecalculateMode)} + * Note that an implementer is responsible for calling {@link PeerGroup#recalculateFastCatchupAndFilter(org.pivxj.core.PeerGroup.FilterRecalculateMode)} * whenever a change occurs which effects the data provided via this interface. */ public interface PeerFilterProvider { diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/pivxj/core/PeerGroup.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/PeerGroup.java rename to core/src/main/java/org/pivxj/core/PeerGroup.java index 2c4eb3c47..0135464af 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerGroup.java +++ b/core/src/main/java/org/pivxj/core/PeerGroup.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.annotations.*; import com.google.common.base.*; @@ -26,17 +26,17 @@ import com.squareup.okhttp.*; import com.subgraph.orchid.*; import net.jcip.annotations.*; -import org.bitcoinj.core.listeners.*; -import org.bitcoinj.crypto.*; -import org.bitcoinj.net.*; -import org.bitcoinj.net.discovery.*; -import org.bitcoinj.script.*; -import org.bitcoinj.utils.*; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.KeyChainEventListener; -import org.bitcoinj.wallet.listeners.ScriptsChangeEventListener; -import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener; +import org.pivxj.core.listeners.*; +import org.pivxj.crypto.*; +import org.pivxj.net.*; +import org.pivxj.net.discovery.*; +import org.pivxj.script.*; +import org.pivxj.utils.*; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.KeyChainEventListener; +import org.pivxj.wallet.listeners.ScriptsChangeEventListener; +import org.pivxj.wallet.listeners.WalletCoinsReceivedEventListener; import org.slf4j.*; import javax.annotation.*; @@ -272,7 +272,7 @@ public void onPeerDisconnected(Peer peer, int peerCount) { * download false positives. This provides maximum performance. Although this default can be overridden to push * the FP rate higher, due to * various complexities there are still ways a remote peer can deanonymize the users wallet. This is why the - * FP rate is chosen for performance rather than privacy. If a future version of bitcoinj fixes the known + * FP rate is chosen for performance rather than privacy. If a future version of pivxj fixes the known * de-anonymization attacks this FP rate may rise again (or more likely, become expressed as a bandwidth allowance). */ public static final double DEFAULT_BLOOM_FILTER_FP_RATE = 0.00001; @@ -1433,7 +1433,7 @@ public void setBloomFilterFalsePositiveRate(double bloomFilterFPRate) { /** * Returns the number of currently connected peers. To be informed when this count changes, register a - * {@link org.bitcoinj.core.listeners.PeerConnectionEventListener} and use the onPeerConnected/onPeerDisconnected methods. + * {@link org.pivxj.core.listeners.PeerConnectionEventListener} and use the onPeerConnected/onPeerDisconnected methods. */ public int numConnectedPeers() { return peers.size(); @@ -1445,7 +1445,7 @@ public int numConnectedPeers() { * * @param address destination IP and port. * @return The newly created Peer object or null if the peer could not be connected. - * Use {@link org.bitcoinj.core.Peer#getConnectionOpenFuture()} if you + * Use {@link org.pivxj.core.Peer#getConnectionOpenFuture()} if you * want a future which completes when the connection is open. */ @Nullable @@ -2015,7 +2015,7 @@ private void startBlockChainDownloadFromPeer(Peer peer) { /** * Returns a future that is triggered when the number of connected peers is equal to the given number of - * peers. By using this with {@link org.bitcoinj.core.PeerGroup#getMaxConnections()} you can wait until the + * peers. By using this with {@link org.pivxj.core.PeerGroup#getMaxConnections()} you can wait until the * network is fully online. To block immediately, just call get() on the result. Just calls * {@link #waitForPeersOfVersion(int, long)} with zero as the protocol version. * @@ -2121,7 +2121,7 @@ public List findPeersWithServiceMask(int mask) { * enough, {@link PeerGroup#broadcastTransaction(Transaction)} will wait until the minimum number is reached so * propagation across the network can be observed. If no value has been set using * {@link PeerGroup#setMinBroadcastConnections(int)} a default of 80% of whatever - * {@link org.bitcoinj.core.PeerGroup#getMaxConnections()} returns is used. + * {@link org.pivxj.core.PeerGroup#getMaxConnections()} returns is used. */ public int getMinBroadcastConnections() { lock.lock(); @@ -2140,7 +2140,7 @@ public int getMinBroadcastConnections() { } /** - * See {@link org.bitcoinj.core.PeerGroup#getMinBroadcastConnections()}. + * See {@link org.pivxj.core.PeerGroup#getMinBroadcastConnections()}. */ public void setMinBroadcastConnections(int value) { lock.lock(); @@ -2172,7 +2172,7 @@ public TransactionBroadcast broadcastTransaction(final Transaction tx,boolean is /** *

Given a transaction, sends it un-announced to one peer and then waits for it to be received back from other * peers. Once all connected peers have announced the transaction, the future available via the - * {@link org.bitcoinj.core.TransactionBroadcast#future()} method will be completed. If anything goes + * {@link org.pivxj.core.TransactionBroadcast#future()} method will be completed. If anything goes * wrong the exception will be thrown when get() is called, or you can receive it via a callback on the * {@link ListenableFuture}. This method returns immediately, so if you want it to block just call get() on the * result.

@@ -2184,7 +2184,7 @@ public TransactionBroadcast broadcastTransaction(final Transaction tx,boolean is * A good choice for proportion would be between 0.5 and 0.8 but if you want faster transmission during initial * bringup of the peer group you can lower it.

* - *

The returned {@link org.bitcoinj.core.TransactionBroadcast} object can be used to get progress feedback, + *

The returned {@link org.pivxj.core.TransactionBroadcast} object can be used to get progress feedback, * which is calculated by watching the transaction propagate across the network and be announced by peers.

*/ public TransactionBroadcast broadcastTransaction(final Transaction tx, final int minConnections, boolean isSwiftX) { @@ -2235,7 +2235,7 @@ public void onFailure(Throwable throwable) { /** * Returns the period between pings for an individual peer. Setting this lower means more accurate and timely ping - * times are available via {@link org.bitcoinj.core.Peer#getLastPingTime()} but it increases load on the + * times are available via {@link org.pivxj.core.Peer#getLastPingTime()} but it increases load on the * remote node. It defaults to 5000. */ public long getPingIntervalMsec() { @@ -2249,10 +2249,10 @@ public long getPingIntervalMsec() { /** * Sets the period between pings for an individual peer. Setting this lower means more accurate and timely ping - * times are available via {@link org.bitcoinj.core.Peer#getLastPingTime()} but it increases load on the + * times are available via {@link org.pivxj.core.Peer#getLastPingTime()} but it increases load on the * remote node. It defaults to {@link PeerGroup#DEFAULT_PING_INTERVAL_MSEC}. * Setting the value to be <= 0 disables pinging entirely, although you can still request one yourself - * using {@link org.bitcoinj.core.Peer#ping()}. + * using {@link org.pivxj.core.Peer#ping()}. */ public void setPingIntervalMsec(long pingIntervalMsec) { lock.lock(); @@ -2396,7 +2396,7 @@ public boolean getUseLocalhostPeerWhenPossible() { /** * When true (the default), PeerGroup will attempt to connect to a Bitcoin node running on localhost before * attempting to use the P2P network. If successful, only localhost will be used. This makes for a simple - * and easy way for a user to upgrade a bitcoinj based app running in SPV mode to fully validating security. + * and easy way for a user to upgrade a pivxj based app running in SPV mode to fully validating security. */ public void setUseLocalhostPeerWhenPossible(boolean useLocalhostPeerWhenPossible) { lock.lock(); diff --git a/core/src/main/java/org/bitcoinj/core/PeerSocketHandler.java b/core/src/main/java/org/pivxj/core/PeerSocketHandler.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/PeerSocketHandler.java rename to core/src/main/java/org/pivxj/core/PeerSocketHandler.java index c064c1f54..5f8281883 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerSocketHandler.java +++ b/core/src/main/java/org/pivxj/core/PeerSocketHandler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.net.AbstractTimeoutHandler; -import org.bitcoinj.net.MessageWriteTarget; -import org.bitcoinj.net.StreamConnection; -import org.bitcoinj.utils.Threading; +import org.pivxj.net.AbstractTimeoutHandler; +import org.pivxj.net.MessageWriteTarget; +import org.pivxj.net.StreamConnection; +import org.pivxj.utils.Threading; import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +37,7 @@ /** * Handles high-level message (de)serialization for peers, acting as the bridge between the - * {@link org.bitcoinj.net} classes and {@link Peer}. + * {@link org.pivxj.net} classes and {@link Peer}. */ public abstract class PeerSocketHandler extends AbstractTimeoutHandler implements StreamConnection { private static final Logger log = LoggerFactory.getLogger(PeerSocketHandler.class); @@ -210,8 +210,8 @@ public int receiveBytes(ByteBuffer buff) { /** * Sets the {@link MessageWriteTarget} used to write messages to the peer. This should almost never be called, it is - * called automatically by {@link org.bitcoinj.net.NioClient} or - * {@link org.bitcoinj.net.NioClientManager} once the socket finishes initialization. + * called automatically by {@link org.pivxj.net.NioClient} or + * {@link org.pivxj.net.NioClientManager} once the socket finishes initialization. */ @Override public void setWriteTarget(MessageWriteTarget writeTarget) { diff --git a/core/src/main/java/org/bitcoinj/core/Ping.java b/core/src/main/java/org/pivxj/core/Ping.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/Ping.java rename to core/src/main/java/org/pivxj/core/Ping.java index fa4faa1fc..3993f2668 100644 --- a/core/src/main/java/org/bitcoinj/core/Ping.java +++ b/core/src/main/java/org/pivxj/core/Ping.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/Pong.java b/core/src/main/java/org/pivxj/core/Pong.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/Pong.java rename to core/src/main/java/org/pivxj/core/Pong.java index eaffa3a8d..81253d8b5 100644 --- a/core/src/main/java/org/bitcoinj/core/Pong.java +++ b/core/src/main/java/org/pivxj/core/Pong.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/org/bitcoinj/core/ProtocolException.java b/core/src/main/java/org/pivxj/core/ProtocolException.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/ProtocolException.java rename to core/src/main/java/org/pivxj/core/ProtocolException.java index b4951343c..f042a5de3 100644 --- a/core/src/main/java/org/bitcoinj/core/ProtocolException.java +++ b/core/src/main/java/org/pivxj/core/ProtocolException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; @SuppressWarnings("serial") public class ProtocolException extends VerificationException { diff --git a/core/src/main/java/org/bitcoinj/core/PrunedException.java b/core/src/main/java/org/pivxj/core/PrunedException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/PrunedException.java rename to core/src/main/java/org/pivxj/core/PrunedException.java index df67dafde..a2d3e7758 100644 --- a/core/src/main/java/org/bitcoinj/core/PrunedException.java +++ b/core/src/main/java/org/pivxj/core/PrunedException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; // TODO: Rename PrunedException to something like RequiredDataWasPrunedException diff --git a/core/src/main/java/org/bitcoinj/core/PublicKey.java b/core/src/main/java/org/pivxj/core/PublicKey.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/PublicKey.java rename to core/src/main/java/org/pivxj/core/PublicKey.java index a36783acb..65d769c2a 100644 --- a/core/src/main/java/org/bitcoinj/core/PublicKey.java +++ b/core/src/main/java/org/pivxj/core/PublicKey.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/RejectMessage.java b/core/src/main/java/org/pivxj/core/RejectMessage.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/RejectMessage.java rename to core/src/main/java/org/pivxj/core/RejectMessage.java index 1d332f0dd..4cfdd17cf 100644 --- a/core/src/main/java/org/bitcoinj/core/RejectMessage.java +++ b/core/src/main/java/org/pivxj/core/RejectMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; import java.io.IOException; diff --git a/core/src/main/java/org/bitcoinj/core/RejectedTransactionException.java b/core/src/main/java/org/pivxj/core/RejectedTransactionException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/RejectedTransactionException.java rename to core/src/main/java/org/pivxj/core/RejectedTransactionException.java index 6b4091888..abe972347 100644 --- a/core/src/main/java/org/bitcoinj/core/RejectedTransactionException.java +++ b/core/src/main/java/org/pivxj/core/RejectedTransactionException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** * This exception is used by the TransactionBroadcast class to indicate that a broadcast diff --git a/core/src/main/java/org/bitcoinj/core/ScriptException.java b/core/src/main/java/org/pivxj/core/ScriptException.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/ScriptException.java rename to core/src/main/java/org/pivxj/core/ScriptException.java index d72bd430a..862eb7bac 100644 --- a/core/src/main/java/org/bitcoinj/core/ScriptException.java +++ b/core/src/main/java/org/pivxj/core/ScriptException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; @SuppressWarnings("serial") public class ScriptException extends VerificationException { diff --git a/core/src/main/java/org/bitcoinj/core/SendHeadersMessage.java b/core/src/main/java/org/pivxj/core/SendHeadersMessage.java similarity index 90% rename from core/src/main/java/org/bitcoinj/core/SendHeadersMessage.java rename to core/src/main/java/org/pivxj/core/SendHeadersMessage.java index 87ae82669..af33b78e1 100644 --- a/core/src/main/java/org/bitcoinj/core/SendHeadersMessage.java +++ b/core/src/main/java/org/pivxj/core/SendHeadersMessage.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; /** * Created by Eric on 10/16/2016. diff --git a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java b/core/src/main/java/org/pivxj/core/Sha256Hash.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/Sha256Hash.java rename to core/src/main/java/org/pivxj/core/Sha256Hash.java index 1e741492e..4169917f8 100644 --- a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java +++ b/core/src/main/java/org/pivxj/core/Sha256Hash.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.io.ByteStreams; import com.google.common.primitives.*; diff --git a/core/src/main/java/org/bitcoinj/core/SporkManager.java b/core/src/main/java/org/pivxj/core/SporkManager.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/SporkManager.java rename to core/src/main/java/org/pivxj/core/SporkManager.java index aefe2c6cf..177c4e407 100644 --- a/core/src/main/java/org/bitcoinj/core/SporkManager.java +++ b/core/src/main/java/org/pivxj/core/SporkManager.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.darkcoinj.DarkSendSigner; diff --git a/core/src/main/java/org/bitcoinj/core/SporkMessage.java b/core/src/main/java/org/pivxj/core/SporkMessage.java similarity index 93% rename from core/src/main/java/org/bitcoinj/core/SporkMessage.java rename to core/src/main/java/org/pivxj/core/SporkMessage.java index bf7057e4a..fb408f7bd 100644 --- a/core/src/main/java/org/bitcoinj/core/SporkMessage.java +++ b/core/src/main/java/org/pivxj/core/SporkMessage.java @@ -1,13 +1,8 @@ -package org.bitcoinj.core; - -import org.bitcoinj.utils.Threading; -import org.darkcoinj.DarkSend; +package org.pivxj.core; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.math.BigInteger; -import java.util.concurrent.locks.ReentrantLock; import static com.hashengineering.crypto.X11.x11Digest; diff --git a/core/src/main/java/org/bitcoinj/core/StoredBlock.java b/core/src/main/java/org/pivxj/core/StoredBlock.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/StoredBlock.java rename to core/src/main/java/org/pivxj/core/StoredBlock.java index 9e108cca0..916e989be 100644 --- a/core/src/main/java/org/bitcoinj/core/StoredBlock.java +++ b/core/src/main/java/org/pivxj/core/StoredBlock.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; import com.google.common.base.Objects; import java.math.BigInteger; import java.nio.BufferOverflowException; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.Locale; import static com.google.common.base.Preconditions.checkState; diff --git a/core/src/main/java/org/bitcoinj/core/StoredUndoableBlock.java b/core/src/main/java/org/pivxj/core/StoredUndoableBlock.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/StoredUndoableBlock.java rename to core/src/main/java/org/pivxj/core/StoredUndoableBlock.java index 7ed60dd2d..d3c9a6f8b 100644 --- a/core/src/main/java/org/bitcoinj/core/StoredUndoableBlock.java +++ b/core/src/main/java/org/pivxj/core/StoredUndoableBlock.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/core/SyncStatusCount.java b/core/src/main/java/org/pivxj/core/SyncStatusCount.java similarity index 89% rename from core/src/main/java/org/bitcoinj/core/SyncStatusCount.java rename to core/src/main/java/org/pivxj/core/SyncStatusCount.java index 017ca81e8..630ee35e8 100644 --- a/core/src/main/java/org/bitcoinj/core/SyncStatusCount.java +++ b/core/src/main/java/org/pivxj/core/SyncStatusCount.java @@ -1,8 +1,5 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.darkcoinj.DarkSendSigner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/pivxj/core/Transaction.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/Transaction.java rename to core/src/main/java/org/pivxj/core/Transaction.java index 46e329538..6d23a1cc1 100644 --- a/core/src/main/java/org/bitcoinj/core/Transaction.java +++ b/core/src/main/java/org/pivxj/core/Transaction.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.bitcoinj.core; - -import org.bitcoinj.core.TransactionConfidence.ConfidenceType; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.bitcoinj.script.ScriptOpCodes; -import org.bitcoinj.signers.TransactionSigner; -import org.bitcoinj.utils.ExchangeRate; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.WalletTransaction.Pool; +package org.pivxj.core; + +import org.pivxj.core.TransactionConfidence.ConfidenceType; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; +import org.pivxj.script.ScriptOpCodes; +import org.pivxj.signers.TransactionSigner; +import org.pivxj.utils.ExchangeRate; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.WalletTransaction.Pool; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Ints; @@ -37,7 +37,7 @@ import java.io.*; import java.util.*; -import static org.bitcoinj.core.Utils.*; +import static org.pivxj.core.Utils.*; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import java.math.BigInteger; @@ -806,7 +806,7 @@ else if (scriptPubKey.isSentToAddress()) } /** - * Same as {@link #addSignedInput(TransactionOutPoint, org.bitcoinj.script.Script, ECKey, org.bitcoinj.core.Transaction.SigHash, boolean)} + * Same as {@link #addSignedInput(TransactionOutPoint, org.pivxj.script.Script, ECKey, org.pivxj.core.Transaction.SigHash, boolean)} * but defaults to {@link SigHash#ALL} and "false" for the anyoneCanPay flag. This is normally what you want. */ public TransactionInput addSignedInput(TransactionOutPoint prevOut, Script scriptPubKey, ECKey sigKey) throws ScriptException { @@ -880,7 +880,7 @@ public TransactionOutput addOutput(Coin value, Script script) { /** * Calculates a signature that is valid for being inserted into the input at the given position. This is simply - * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], org.bitcoinj.core.Transaction.SigHash, boolean)} + * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], org.pivxj.core.Transaction.SigHash, boolean)} * followed by {@link ECKey#sign(Sha256Hash)} and then returning a new {@link TransactionSignature}. The key * must be usable for signing as-is: if the key is encrypted it must be decrypted first external to this method. * @@ -900,7 +900,7 @@ public TransactionSignature calculateSignature(int inputIndex, ECKey key, /** * Calculates a signature that is valid for being inserted into the input at the given position. This is simply - * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], org.bitcoinj.core.Transaction.SigHash, boolean)} + * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], org.pivxj.core.Transaction.SigHash, boolean)} * followed by {@link ECKey#sign(Sha256Hash)} and then returning a new {@link TransactionSignature}. * * @param inputIndex Which input to calculate the signature for, as an index. @@ -1144,7 +1144,7 @@ public TransactionOutput getOutput(long index) { } /** - * Returns the confidence object for this transaction from the {@link org.bitcoinj.core.TxConfidenceTable} + * Returns the confidence object for this transaction from the {@link org.pivxj.core.TxConfidenceTable} * referenced by the implicit {@link Context}. */ public TransactionConfidence getConfidence() { @@ -1152,7 +1152,7 @@ public TransactionConfidence getConfidence() { } /** - * Returns the confidence object for this transaction from the {@link org.bitcoinj.core.TxConfidenceTable} + * Returns the confidence object for this transaction from the {@link org.pivxj.core.TxConfidenceTable} * referenced by the given {@link Context}. */ public TransactionConfidence getConfidence(Context context) { @@ -1160,7 +1160,7 @@ public TransactionConfidence getConfidence(Context context) { } /** - * Returns the confidence object for this transaction from the {@link org.bitcoinj.core.TxConfidenceTable} + * Returns the confidence object for this transaction from the {@link org.pivxj.core.TxConfidenceTable} */ public TransactionConfidence getConfidence(TxConfidenceTable table) { if (confidence == null) diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBag.java b/core/src/main/java/org/pivxj/core/TransactionBag.java similarity index 85% rename from core/src/main/java/org/bitcoinj/core/TransactionBag.java rename to core/src/main/java/org/pivxj/core/TransactionBag.java index e391adca2..edcafd5f5 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionBag.java +++ b/core/src/main/java/org/pivxj/core/TransactionBag.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.Script; -import org.bitcoinj.wallet.WalletTransaction; +import org.pivxj.script.Script; +import org.pivxj.wallet.WalletTransaction; import java.util.Map; /** - * This interface is used to abstract the {@link org.bitcoinj.wallet.Wallet} and the {@link org.bitcoinj.core.Transaction} + * This interface is used to abstract the {@link org.pivxj.wallet.Wallet} and the {@link org.pivxj.core.Transaction} */ public interface TransactionBag { /** Returns true if this wallet contains a public key which hashes to the given hash. */ diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java b/core/src/main/java/org/pivxj/core/TransactionBroadcast.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java rename to core/src/main/java/org/pivxj/core/TransactionBroadcast.java index 220ea22e9..ef4e15979 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java +++ b/core/src/main/java/org/pivxj/core/TransactionBroadcast.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.annotations.*; import com.google.common.base.*; import com.google.common.util.concurrent.*; -import org.bitcoinj.utils.*; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.utils.*; +import org.pivxj.wallet.Wallet; import org.slf4j.*; import javax.annotation.*; @@ -28,7 +28,7 @@ import java.util.concurrent.*; import static com.google.common.base.Preconditions.checkState; -import org.bitcoinj.core.listeners.PreMessageReceivedEventListener; +import org.pivxj.core.listeners.PreMessageReceivedEventListener; /** * Represents a single transaction broadcast that we are performing. A broadcast occurs after a new transaction is created @@ -274,7 +274,7 @@ public interface ProgressCallback { /** * Sets the given callback for receiving progress values, which will run on the user thread. See - * {@link org.bitcoinj.utils.Threading} for details. If the broadcast has already started then the callback will + * {@link org.pivxj.utils.Threading} for details. If the broadcast has already started then the callback will * be invoked immediately with the current progress. */ public void setProgressCallback(ProgressCallback callback) { diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBroadcaster.java b/core/src/main/java/org/pivxj/core/TransactionBroadcaster.java similarity index 93% rename from core/src/main/java/org/bitcoinj/core/TransactionBroadcaster.java rename to core/src/main/java/org/pivxj/core/TransactionBroadcaster.java index 3e37090e6..d293e9b9d 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionBroadcaster.java +++ b/core/src/main/java/org/pivxj/core/TransactionBroadcaster.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** * A general interface which declares the ability to broadcast transactions. This is implemented - * by {@link org.bitcoinj.core.PeerGroup}. + * by {@link org.pivxj.core.PeerGroup}. */ public interface TransactionBroadcaster { /** Broadcast the given transaction on the network */ diff --git a/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java b/core/src/main/java/org/pivxj/core/TransactionConfidence.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/TransactionConfidence.java rename to core/src/main/java/org/pivxj/core/TransactionConfidence.java index 8f8cd5a40..ad9bc8176 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java +++ b/core/src/main/java/org/pivxj/core/TransactionConfidence.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.collect.*; import com.google.common.util.concurrent.*; -import org.bitcoinj.utils.*; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.utils.*; +import org.pivxj.wallet.Wallet; import javax.annotation.*; import java.util.*; @@ -55,9 +55,9 @@ *

Alternatively, you may know that the transaction is "dead", that is, one or more of its inputs have * been double spent and will never confirm unless there is another re-org.

* - *

TransactionConfidence is updated via the {@link org.bitcoinj.core.TransactionConfidence#incrementDepthInBlocks()} + *

TransactionConfidence is updated via the {@link org.pivxj.core.TransactionConfidence#incrementDepthInBlocks()} * method to ensure the block depth is up to date.

- * To make a copy that won't be changed, use {@link org.bitcoinj.core.TransactionConfidence#duplicate()}. + * To make a copy that won't be changed, use {@link org.pivxj.core.TransactionConfidence#duplicate()}. */ public class TransactionConfidence { @@ -87,7 +87,7 @@ public enum ConfidenceType { * announced and is considered valid by the network. A pending transaction will be announced if the containing * wallet has been attached to a live {@link PeerGroup} using {@link PeerGroup#addWallet(Wallet)}. * You can estimate how likely the transaction is to be included by connecting to a bunch of nodes then measuring - * how many announce it, using {@link org.bitcoinj.core.TransactionConfidence#numBroadcastPeers()}. + * how many announce it, using {@link org.pivxj.core.TransactionConfidence#numBroadcastPeers()}. * Or if you saw it from a trusted peer, you can assume it's valid and will get mined sooner or later as well. */ PENDING(2), @@ -164,7 +164,7 @@ public interface Listener { /** An enum that describes why a transaction confidence listener is being invoked (i.e. the class of change). */ enum ChangeReason { /** - * Occurs when the type returned by {@link org.bitcoinj.core.TransactionConfidence#getConfidenceType()} + * Occurs when the type returned by {@link org.pivxj.core.TransactionConfidence#getConfidenceType()} * has changed. For example, if a PENDING transaction changes to BUILDING or DEAD, then this reason will * be given. It's a high level summary. */ @@ -184,7 +184,7 @@ enum ChangeReason { */ SEEN_PEERS, /** - * Occurs when the type returned by {@link org.bitcoinj.core.TransactionConfidence#getIXType()} + * Occurs when the type returned by {@link org.pivxj.core.TransactionConfidence#getIXType()} * has changed. For example, if a IX_REQUEST transaction changes to IX_LOCKED, then this reason will * be given. */ @@ -473,7 +473,7 @@ public void run() { /** * The source of a transaction tries to identify where it came from originally. For instance, did we download it * from the peer to peer network, or make it ourselves, or receive it via Bluetooth, or import it from another app, - * and so on. This information is useful for {@link org.bitcoinj.wallet.CoinSelector} implementations to risk analyze + * and so on. This information is useful for {@link org.pivxj.wallet.CoinSelector} implementations to risk analyze * transactions and decide when to spend them. */ public synchronized Source getSource() { @@ -483,7 +483,7 @@ public synchronized Source getSource() { /** * The source of a transaction tries to identify where it came from originally. For instance, did we download it * from the peer to peer network, or make it ourselves, or receive it via Bluetooth, or import it from another app, - * and so on. This information is useful for {@link org.bitcoinj.wallet.CoinSelector} implementations to risk analyze + * and so on. This information is useful for {@link org.pivxj.wallet.CoinSelector} implementations to risk analyze * transactions and decide when to spend them. */ public synchronized void setSource(Source source) { diff --git a/core/src/main/java/org/bitcoinj/core/TransactionInput.java b/core/src/main/java/org/pivxj/core/TransactionInput.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/TransactionInput.java rename to core/src/main/java/org/pivxj/core/TransactionInput.java index aa2ebb02f..21ebc8590 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionInput.java +++ b/core/src/main/java/org/pivxj/core/TransactionInput.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.Script; -import org.bitcoinj.wallet.DefaultRiskAnalysis; -import org.bitcoinj.wallet.KeyBag; -import org.bitcoinj.wallet.RedeemData; +import org.pivxj.script.Script; +import org.pivxj.wallet.DefaultRiskAnalysis; +import org.pivxj.wallet.KeyBag; +import org.pivxj.wallet.RedeemData; import com.google.common.base.Joiner; import com.google.common.base.Objects; @@ -301,7 +301,7 @@ TransactionOutput getConnectedOutput(Map transactions) /** * Alias for getOutpoint().getConnectedRedeemData(keyBag) - * @see TransactionOutPoint#getConnectedRedeemData(org.bitcoinj.wallet.KeyBag) + * @see TransactionOutPoint#getConnectedRedeemData(org.pivxj.wallet.KeyBag) */ @Nullable public RedeemData getConnectedRedeemData(KeyBag keyBag) throws ScriptException { diff --git a/core/src/main/java/org/bitcoinj/core/TransactionLock.java b/core/src/main/java/org/pivxj/core/TransactionLock.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/TransactionLock.java rename to core/src/main/java/org/pivxj/core/TransactionLock.java index f10c47e33..caa9d090b 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionLock.java +++ b/core/src/main/java/org/pivxj/core/TransactionLock.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/TransactionLockCandidate.java b/core/src/main/java/org/pivxj/core/TransactionLockCandidate.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/TransactionLockCandidate.java rename to core/src/main/java/org/pivxj/core/TransactionLockCandidate.java index 36f359b14..d2636b62a 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionLockCandidate.java +++ b/core/src/main/java/org/pivxj/core/TransactionLockCandidate.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.darkcoinj.InstantSend; diff --git a/core/src/main/java/org/bitcoinj/core/TransactionLockRequest.java b/core/src/main/java/org/pivxj/core/TransactionLockRequest.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/TransactionLockRequest.java rename to core/src/main/java/org/pivxj/core/TransactionLockRequest.java index 416ec56aa..dcba7f1f1 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionLockRequest.java +++ b/core/src/main/java/org/pivxj/core/TransactionLockRequest.java @@ -1,4 +1,4 @@ -package org.bitcoinj.core; +package org.pivxj.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/core/TransactionLockVote.java b/core/src/main/java/org/pivxj/core/TransactionLockVote.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/TransactionLockVote.java rename to core/src/main/java/org/pivxj/core/TransactionLockVote.java index a72eb38f3..58d905784 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionLockVote.java +++ b/core/src/main/java/org/pivxj/core/TransactionLockVote.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import org.darkcoinj.DarkSendSigner; import org.darkcoinj.InstantSend; diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java b/core/src/main/java/org/pivxj/core/TransactionOutPoint.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java rename to core/src/main/java/org/pivxj/core/TransactionOutPoint.java index ff828b521..3912232ff 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java +++ b/core/src/main/java/org/pivxj/core/TransactionOutPoint.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; -import org.bitcoinj.script.*; -import org.bitcoinj.wallet.*; +import org.pivxj.script.*; +import org.pivxj.wallet.*; import javax.annotation.*; import java.io.*; @@ -130,7 +130,7 @@ public byte[] getConnectedPubKeyScript() { /** * Returns the ECKey identified in the connected output, for either pay-to-address scripts or pay-to-key scripts. - * For P2SH scripts you can use {@link #getConnectedRedeemData(org.bitcoinj.wallet.KeyBag)} and then get the + * For P2SH scripts you can use {@link #getConnectedRedeemData(org.pivxj.wallet.KeyBag)} and then get the * key from RedeemData. * If the script form cannot be understood, throws ScriptException. * diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutPointLock.java b/core/src/main/java/org/pivxj/core/TransactionOutPointLock.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/TransactionOutPointLock.java rename to core/src/main/java/org/pivxj/core/TransactionOutPointLock.java index db9519a12..d47defaf7 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionOutPointLock.java +++ b/core/src/main/java/org/pivxj/core/TransactionOutPointLock.java @@ -1,6 +1,5 @@ -package org.bitcoinj.core; +package org.pivxj.core; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java b/core/src/main/java/org/pivxj/core/TransactionOutput.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/TransactionOutput.java rename to core/src/main/java/org/pivxj/core/TransactionOutput.java index 357cdc2ca..c9b819d66 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java +++ b/core/src/main/java/org/pivxj/core/TransactionOutput.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; -import org.bitcoinj.script.*; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.script.*; +import org.pivxj.wallet.Wallet; import org.slf4j.*; import javax.annotation.*; @@ -223,7 +223,7 @@ public boolean isDust() { * so we call them "dust outputs" and they're made non standard. The choice of one third is somewhat arbitrary and * may change in future.

* - *

You probably should use {@link org.bitcoinj.core.TransactionOutput#getMinNonDustValue()} which uses + *

You probably should use {@link org.pivxj.core.TransactionOutput#getMinNonDustValue()} which uses * a safe fee-per-kb by default.

* * @param feePerKb The fee required per kilobyte. Note that this is the same as Bitcoin Core's -minrelaytxfee * 3 diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java b/core/src/main/java/org/pivxj/core/TransactionOutputChanges.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java rename to core/src/main/java/org/pivxj/core/TransactionOutputChanges.java index d006795ed..ff8b1a831 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java +++ b/core/src/main/java/org/pivxj/core/TransactionOutputChanges.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java b/core/src/main/java/org/pivxj/core/TxConfidenceTable.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java rename to core/src/main/java/org/pivxj/core/TxConfidenceTable.java index cb2c4a3b3..850e3e60d 100644 --- a/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java +++ b/core/src/main/java/org/pivxj/core/TxConfidenceTable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.utils.*; +import org.pivxj.utils.*; import javax.annotation.*; import java.lang.ref.*; @@ -131,7 +131,7 @@ public int numBroadcastPeers(Sha256Hash txHash) { /** * Called by peers when they see a transaction advertised in an "inv" message. It passes the data on to the relevant - * {@link org.bitcoinj.core.TransactionConfidence} object, creating it if needed. + * {@link org.pivxj.core.TransactionConfidence} object, creating it if needed. * * @return the number of peers that have now announced this hash (including the caller) */ diff --git a/core/src/main/java/org/bitcoinj/core/UTXO.java b/core/src/main/java/org/pivxj/core/UTXO.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/UTXO.java rename to core/src/main/java/org/pivxj/core/UTXO.java index 5012bd00c..8805d468b 100644 --- a/core/src/main/java/org/bitcoinj/core/UTXO.java +++ b/core/src/main/java/org/pivxj/core/UTXO.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; -import org.bitcoinj.script.*; +import org.pivxj.script.*; import com.google.common.base.Objects; import java.io.*; diff --git a/core/src/main/java/org/bitcoinj/core/UTXOProvider.java b/core/src/main/java/org/pivxj/core/UTXOProvider.java similarity index 92% rename from core/src/main/java/org/bitcoinj/core/UTXOProvider.java rename to core/src/main/java/org/pivxj/core/UTXOProvider.java index aa7fdbaaf..5c8238036 100644 --- a/core/src/main/java/org/bitcoinj/core/UTXOProvider.java +++ b/core/src/main/java/org/pivxj/core/UTXOProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.util.List; @@ -22,7 +22,7 @@ * A UTXOProvider encapsulates functionality for returning unspent transaction outputs, * for use by the wallet or other code that crafts spends. * - *

A {@link org.bitcoinj.store.FullPrunedBlockStore} is an internal implementation within bitcoinj.

+ *

A {@link org.pivxj.store.FullPrunedBlockStore} is an internal implementation within pivxj.

*/ public interface UTXOProvider { diff --git a/core/src/main/java/org/bitcoinj/core/UTXOProviderException.java b/core/src/main/java/org/pivxj/core/UTXOProviderException.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/UTXOProviderException.java rename to core/src/main/java/org/pivxj/core/UTXOProviderException.java index 64d9c81f0..38fcf7787 100644 --- a/core/src/main/java/org/bitcoinj/core/UTXOProviderException.java +++ b/core/src/main/java/org/pivxj/core/UTXOProviderException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; public class UTXOProviderException extends Exception { public UTXOProviderException() { diff --git a/core/src/main/java/org/bitcoinj/core/UTXOsMessage.java b/core/src/main/java/org/pivxj/core/UTXOsMessage.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/UTXOsMessage.java rename to core/src/main/java/org/pivxj/core/UTXOsMessage.java index 6b04c42f1..1a62310e2 100644 --- a/core/src/main/java/org/bitcoinj/core/UTXOsMessage.java +++ b/core/src/main/java/org/pivxj/core/UTXOsMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; import java.io.IOException; @@ -28,7 +28,7 @@ * {@link GetUTXOsMessage} ("getutxos"). Note that both this message and the query that generates it are not * supported by Bitcoin Core. An implementation is available in Bitcoin XT, * a patch set on top of Core. Thus if you want to use it, you must find some XT peers to connect to. This can be done - * using a {@link org.bitcoinj.net.discovery.HttpDiscovery} class combined with an HTTP/Cartographer seed.

+ * using a {@link org.pivxj.net.discovery.HttpDiscovery} class combined with an HTTP/Cartographer seed.

* *

The getutxos/utxos protocol is defined in BIP 65. * In that document you can find a discussion of the security of this protocol (briefly, there is none). Because the diff --git a/core/src/main/java/org/bitcoinj/core/UnknownMessage.java b/core/src/main/java/org/pivxj/core/UnknownMessage.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/UnknownMessage.java rename to core/src/main/java/org/pivxj/core/UnknownMessage.java index e8951ab0a..51ba49f03 100644 --- a/core/src/main/java/org/bitcoinj/core/UnknownMessage.java +++ b/core/src/main/java/org/pivxj/core/UnknownMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** *

Instances of this class are not safe for use by multiple threads.

diff --git a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java b/core/src/main/java/org/pivxj/core/UnsafeByteArrayOutputStream.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java rename to core/src/main/java/org/pivxj/core/UnsafeByteArrayOutputStream.java index e6dd02149..4c0ac6899 100644 --- a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java +++ b/core/src/main/java/org/pivxj/core/UnsafeByteArrayOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/core/src/main/java/org/bitcoinj/core/Utils.java b/core/src/main/java/org/pivxj/core/Utils.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/Utils.java rename to core/src/main/java/org/pivxj/core/Utils.java index 121cc1432..59eef6569 100644 --- a/core/src/main/java/org/bitcoinj/core/Utils.java +++ b/core/src/main/java/org/pivxj/core/Utils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Charsets; import com.google.common.base.Joiner; diff --git a/core/src/main/java/org/bitcoinj/core/VarInt.java b/core/src/main/java/org/pivxj/core/VarInt.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/VarInt.java rename to core/src/main/java/org/pivxj/core/VarInt.java index 7969ffa29..21f5ce8a5 100644 --- a/core/src/main/java/org/bitcoinj/core/VarInt.java +++ b/core/src/main/java/org/pivxj/core/VarInt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** * A variable-length encoded unsigned integer using Satoshi's encoding (a.k.a. "CompactSize"). diff --git a/core/src/main/java/org/bitcoinj/core/VerificationException.java b/core/src/main/java/org/pivxj/core/VerificationException.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/VerificationException.java rename to core/src/main/java/org/pivxj/core/VerificationException.java index 14daabc38..4d28f2df4 100644 --- a/core/src/main/java/org/bitcoinj/core/VerificationException.java +++ b/core/src/main/java/org/pivxj/core/VerificationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; @SuppressWarnings("serial") public class VerificationException extends RuntimeException { diff --git a/core/src/main/java/org/bitcoinj/core/VersionAck.java b/core/src/main/java/org/pivxj/core/VersionAck.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/VersionAck.java rename to core/src/main/java/org/pivxj/core/VersionAck.java index 0dcfb05a5..d23b22336 100644 --- a/core/src/main/java/org/bitcoinj/core/VersionAck.java +++ b/core/src/main/java/org/pivxj/core/VersionAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; /** *

The verack message, sent by a client accepting the version message they diff --git a/core/src/main/java/org/bitcoinj/core/VersionMessage.java b/core/src/main/java/org/pivxj/core/VersionMessage.java similarity index 97% rename from core/src/main/java/org/bitcoinj/core/VersionMessage.java rename to core/src/main/java/org/pivxj/core/VersionMessage.java index 9973c970e..409481229 100644 --- a/core/src/main/java/org/bitcoinj/core/VersionMessage.java +++ b/core/src/main/java/org/pivxj/core/VersionMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import com.google.common.base.Objects; import javax.annotation.Nullable; @@ -240,8 +240,8 @@ public VersionMessage duplicate() { /** * Appends the given user-agent information to the subVer field. The subVer is composed of a series of - * name:version pairs separated by slashes in the form of a path. For example a typical subVer field for bitcoinj - * users might look like "/bitcoinj:0.13/MultiBit:1.2/" where libraries come further to the left.

+ * name:version pairs separated by slashes in the form of a path. For example a typical subVer field for pivxj + * users might look like "/pivxj:0.13/MultiBit:1.2/" where libraries come further to the left.

* * There can be as many components as you feel a need for, and the version string can be anything, but it is * recommended to use A.B.C where A = major, B = minor and C = revision for software releases, and dates for @@ -250,7 +250,7 @@ public VersionMessage duplicate() { * * Anything put in the "comments" field will appear in brackets and may be used for platform info, or anything * else. For example, calling appendToSubVer("MultiBit", "1.0", "Windows") will result in a subVer being - * set of "/bitcoinj:1.0/MultiBit:1.0(Windows)/". Therefore the / ( and ) characters are reserved in all these + * set of "/pivxj:1.0/MultiBit:1.0(Windows)/". Therefore the / ( and ) characters are reserved in all these * components. If you don't want to add a comment (recommended), pass null.

* * See BIP 14 for more information. diff --git a/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java b/core/src/main/java/org/pivxj/core/VersionedChecksummedBytes.java similarity index 99% rename from core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java rename to core/src/main/java/org/pivxj/core/VersionedChecksummedBytes.java index 381414906..1f12adeab 100644 --- a/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java +++ b/core/src/main/java/org/pivxj/core/VersionedChecksummedBytes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import static com.google.common.base.Preconditions.checkArgument; diff --git a/core/src/main/java/org/bitcoinj/core/WrongNetworkException.java b/core/src/main/java/org/pivxj/core/WrongNetworkException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/core/WrongNetworkException.java rename to core/src/main/java/org/pivxj/core/WrongNetworkException.java index e49dd284e..cd6206470 100644 --- a/core/src/main/java/org/bitcoinj/core/WrongNetworkException.java +++ b/core/src/main/java/org/pivxj/core/WrongNetworkException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.core; +package org.pivxj.core; import java.util.Arrays; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java b/core/src/main/java/org/pivxj/core/listeners/AbstractBlockChainListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java rename to core/src/main/java/org/pivxj/core/listeners/AbstractBlockChainListener.java index 391edba32..7596fbdf5 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/AbstractBlockChainListener.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.util.*; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java b/core/src/main/java/org/pivxj/core/listeners/AbstractPeerConnectionEventListener.java similarity index 94% rename from core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/AbstractPeerConnectionEventListener.java index 6e5aa5ba9..b79d1b1fd 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/AbstractPeerConnectionEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.util.*; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerDataEventListener.java b/core/src/main/java/org/pivxj/core/listeners/AbstractPeerDataEventListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerDataEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/AbstractPeerDataEventListener.java index 81595672c..e0fbc6d12 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerDataEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/AbstractPeerDataEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import javax.annotation.*; import java.util.*; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java b/core/src/main/java/org/pivxj/core/listeners/AbstractPeerEventListener.java similarity index 86% rename from core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/AbstractPeerEventListener.java index a8d9ee54a..2dd3b2ab4 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/AbstractPeerEventListener.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.Block; -import org.bitcoinj.core.FilteredBlock; -import org.bitcoinj.core.GetDataMessage; -import org.bitcoinj.core.Message; -import org.bitcoinj.core.PeerAddress; -import org.bitcoinj.core.Peer; -import org.bitcoinj.core.Transaction; +import org.pivxj.core.Block; +import org.pivxj.core.FilteredBlock; +import org.pivxj.core.GetDataMessage; +import org.pivxj.core.Message; +import org.pivxj.core.PeerAddress; +import org.pivxj.core.Peer; +import org.pivxj.core.Transaction; import javax.annotation.*; import java.util.List; import java.util.Set; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java b/core/src/main/java/org/pivxj/core/listeners/BlockChainListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java rename to core/src/main/java/org/pivxj/core/listeners/BlockChainListener.java index a19a42b74..e3b280598 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/BlockChainListener.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; /** * Old interface for backwards compatibility. Implement the more specific interfaces instead. diff --git a/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java b/core/src/main/java/org/pivxj/core/listeners/BlocksDownloadedEventListener.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/BlocksDownloadedEventListener.java index 6edb2282b..5366ef589 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/BlocksDownloadedEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import javax.annotation.*; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java b/core/src/main/java/org/pivxj/core/listeners/ChainDownloadStartedEventListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/ChainDownloadStartedEventListener.java index 434b08434..4439c3ab8 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/ChainDownloadStartedEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; /** *

Implementors can listen to events like blocks being downloaded/transactions being broadcast/connect/disconnects, diff --git a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java b/core/src/main/java/org/pivxj/core/listeners/DownloadProgressTracker.java similarity index 96% rename from core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java rename to core/src/main/java/org/pivxj/core/listeners/DownloadProgressTracker.java index dfd8b1fd6..7c9300a9a 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java +++ b/core/src/main/java/org/pivxj/core/listeners/DownloadProgressTracker.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.Block; -import org.bitcoinj.core.FilteredBlock; -import org.bitcoinj.core.Peer; -import org.bitcoinj.core.Utils; +import org.pivxj.core.Block; +import org.pivxj.core.FilteredBlock; +import org.pivxj.core.Peer; +import org.pivxj.core.Utils; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import org.slf4j.Logger; diff --git a/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java b/core/src/main/java/org/pivxj/core/listeners/GetDataEventListener.java similarity index 91% rename from core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/GetDataEventListener.java index 2fbc1e0c1..d175c92b4 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/GetDataEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import javax.annotation.*; import java.util.*; @@ -33,7 +33,7 @@ public interface GetDataEventListener { * items as possible which appear in the {@link GetDataMessage}, or null if you're not interested in responding.

* *

Note that this will never be called if registered with any executor other than - * {@link org.bitcoinj.utils.Threading#SAME_THREAD}

+ * {@link org.pivxj.utils.Threading#SAME_THREAD}

*/ @Nullable List getData(Peer peer, GetDataMessage m); diff --git a/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java b/core/src/main/java/org/pivxj/core/listeners/NewBestBlockListener.java similarity index 78% rename from core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java rename to core/src/main/java/org/pivxj/core/listeners/NewBestBlockListener.java index 178b34703..6ce560f18 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/NewBestBlockListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.StoredBlock; -import org.bitcoinj.core.VerificationException; +import org.pivxj.core.StoredBlock; +import org.pivxj.core.VerificationException; /** * Listener interface for when a new block on the best chain is seen. @@ -26,8 +26,8 @@ public interface NewBestBlockListener { /** * Called when a new block on the best chain is seen, after relevant * transactions are extracted and sent to us via either - * {@link TransactionReceivedInBlockListener#receiveFromBlock(org.bitcoinj.core.Transaction, org.bitcoinj.core.StoredBlock, org.bitcoinj.core.BlockChain.NewBlockType, int relativityOffset)} - * or {@link TransactionReceivedInBlockListener#notifyTransactionIsInBlock(org.bitcoinj.core.Sha256Hash, org.bitcoinj.core.StoredBlock, org.bitcoinj.core.BlockChain.NewBlockType, int)}. + * {@link TransactionReceivedInBlockListener#receiveFromBlock(org.pivxj.core.Transaction, org.pivxj.core.StoredBlock, org.pivxj.core.BlockChain.NewBlockType, int relativityOffset)} + * or {@link TransactionReceivedInBlockListener#notifyTransactionIsInBlock(org.pivxj.core.Sha256Hash, org.pivxj.core.StoredBlock, org.pivxj.core.BlockChain.NewBlockType, int)}. * If this block is causing a re-organise to a new chain, this method is NOT * called even though the block may be the new best block: your reorganize * implementation is expected to do whatever would normally be done do for a diff --git a/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java b/core/src/main/java/org/pivxj/core/listeners/OnTransactionBroadcastListener.java similarity index 92% rename from core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java rename to core/src/main/java/org/pivxj/core/listeners/OnTransactionBroadcastListener.java index 9ae94af20..b48a597f9 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/OnTransactionBroadcastListener.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; /** * Called when a new transaction is broadcast over the network. diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java b/core/src/main/java/org/pivxj/core/listeners/PeerConnectedEventListener.java similarity index 93% rename from core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/PeerConnectedEventListener.java index c41722038..0e5a5af93 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/PeerConnectedEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.Peer; +import org.pivxj.core.Peer; /** *

Implementors can listen to events indicating a new peer connecting.

diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java b/core/src/main/java/org/pivxj/core/listeners/PeerConnectionEventListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/PeerConnectionEventListener.java index ed5e9d901..9ac2c7b43 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/PeerConnectionEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.Peer; +import org.pivxj.core.Peer; /** *

Implementors can listen to events like peer discovery, connect or disconnects.

diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDataEventListener.java b/core/src/main/java/org/pivxj/core/listeners/PeerDataEventListener.java similarity index 94% rename from core/src/main/java/org/bitcoinj/core/listeners/PeerDataEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/PeerDataEventListener.java index 5d42cc468..9bef8fc9c 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDataEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/PeerDataEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; /** *

Implementors can listen to events like blocks being downloaded/transactions being broadcast/connect/disconnects, diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java b/core/src/main/java/org/pivxj/core/listeners/PeerDisconnectedEventListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/PeerDisconnectedEventListener.java index 7565b2c8c..81aba05b4 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/PeerDisconnectedEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.Peer; +import org.pivxj.core.Peer; /** *

Implementors can listen to events indicating a peer disconnecting.

diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java b/core/src/main/java/org/pivxj/core/listeners/PeerDiscoveredEventListener.java similarity index 90% rename from core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/PeerDiscoveredEventListener.java index 45d6f2473..631e909c2 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/PeerDiscoveredEventListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.Peer; -import org.bitcoinj.core.PeerAddress; +import org.pivxj.core.Peer; +import org.pivxj.core.PeerAddress; import java.util.Set; /** diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java b/core/src/main/java/org/pivxj/core/listeners/PreMessageReceivedEventListener.java similarity index 92% rename from core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/PreMessageReceivedEventListener.java index ff1256430..92d98c7b3 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/PreMessageReceivedEventListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.*; +import org.pivxj.core.*; /** *

Implementors can listen to events like blocks being downloaded/transactions being broadcast/connect/disconnects, @@ -32,7 +32,7 @@ public interface PreMessageReceivedEventListener { * callback is passed as "m" to the next, forming a chain.

* *

Note that this will never be called if registered with any executor other than - * {@link org.bitcoinj.utils.Threading#SAME_THREAD}

+ * {@link org.pivxj.utils.Threading#SAME_THREAD}

*/ Message onPreMessageReceived(Peer peer, Message m); } diff --git a/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java b/core/src/main/java/org/pivxj/core/listeners/ReorganizeListener.java similarity index 86% rename from core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java rename to core/src/main/java/org/pivxj/core/listeners/ReorganizeListener.java index 67c59bd36..a9f64241c 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/ReorganizeListener.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; import java.util.List; -import org.bitcoinj.core.StoredBlock; -import org.bitcoinj.core.VerificationException; +import org.pivxj.core.StoredBlock; +import org.pivxj.core.VerificationException; /** * Listener interface for when the best chain has changed. @@ -26,7 +26,7 @@ public interface ReorganizeListener { /** - * Called by the {@link org.bitcoinj.core.BlockChain} when the best chain + * Called by the {@link org.pivxj.core.BlockChain} when the best chain * (representing total work done) has changed. In this case, * we need to go through our transactions and find out if any have become invalid. It's possible for our balance * to go down in this case: money we thought we had can suddenly vanish if the rest of the network agrees it diff --git a/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java b/core/src/main/java/org/pivxj/core/listeners/TransactionConfidenceEventListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java rename to core/src/main/java/org/pivxj/core/listeners/TransactionConfidenceEventListener.java index 542bd017a..3e4f68857 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/TransactionConfidenceEventListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.Transaction; +import org.pivxj.wallet.Wallet; /** *

Implementors are called when confidence of a transaction changes.

diff --git a/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java b/core/src/main/java/org/pivxj/core/listeners/TransactionReceivedInBlockListener.java similarity index 93% rename from core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java rename to core/src/main/java/org/pivxj/core/listeners/TransactionReceivedInBlockListener.java index c1b1865c7..2e1c875ac 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java +++ b/core/src/main/java/org/pivxj/core/listeners/TransactionReceivedInBlockListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.bitcoinj.core.listeners; +package org.pivxj.core.listeners; -import org.bitcoinj.core.BlockChain; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.StoredBlock; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.VerificationException; +import org.pivxj.core.BlockChain; +import org.pivxj.core.Sha256Hash; +import org.pivxj.core.StoredBlock; +import org.pivxj.core.Transaction; +import org.pivxj.core.VerificationException; /** * Listener interface for when we receive a new block that contains a relevant diff --git a/core/src/main/java/org/bitcoinj/core/package-info.java b/core/src/main/java/org/pivxj/core/package-info.java similarity index 83% rename from core/src/main/java/org/bitcoinj/core/package-info.java rename to core/src/main/java/org/pivxj/core/package-info.java index 0b0756870..334f8a6cd 100644 --- a/core/src/main/java/org/bitcoinj/core/package-info.java +++ b/core/src/main/java/org/pivxj/core/package-info.java @@ -13,10 +13,10 @@ */ /** - * The core package contains classes for network messages like {@link org.bitcoinj.core.Block} and - * {@link org.bitcoinj.core.Transaction}, peer connectivity via {@link org.bitcoinj.core.PeerGroup}, + * The core package contains classes for network messages like {@link org.pivxj.core.Block} and + * {@link org.pivxj.core.Transaction}, peer connectivity via {@link org.pivxj.core.PeerGroup}, * and block chain management. * If what you're doing can be described as basic bitcoin tasks, the code is probably found here. * To learn more please consult the documentation on the website. */ -package org.bitcoinj.core; \ No newline at end of file +package org.pivxj.core; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java b/core/src/main/java/org/pivxj/crypto/BIP38PrivateKey.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java rename to core/src/main/java/org/pivxj/crypto/BIP38PrivateKey.java index 23520d3bb..69e857940 100644 --- a/core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java +++ b/core/src/main/java/org/pivxj/crypto/BIP38PrivateKey.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import com.google.common.base.Charsets; import com.google.common.base.Objects; import com.google.common.primitives.Bytes; diff --git a/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java b/core/src/main/java/org/pivxj/crypto/ChildNumber.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/ChildNumber.java rename to core/src/main/java/org/pivxj/crypto/ChildNumber.java index 1952036ba..8cf293bf2 100644 --- a/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java +++ b/core/src/main/java/org/pivxj/crypto/ChildNumber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import java.util.Locale; diff --git a/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java b/core/src/main/java/org/pivxj/crypto/DRMWorkaround.java similarity index 97% rename from core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java rename to core/src/main/java/org/pivxj/crypto/DRMWorkaround.java index 7f8320e40..f82a01266 100644 --- a/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java +++ b/core/src/main/java/org/pivxj/crypto/DRMWorkaround.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.core.Utils; +import org.pivxj.core.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java b/core/src/main/java/org/pivxj/crypto/DeterministicHierarchy.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java rename to core/src/main/java/org/pivxj/crypto/DeterministicHierarchy.java index eba119fd7..40f72418f 100644 --- a/core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java +++ b/core/src/main/java/org/pivxj/crypto/DeterministicHierarchy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; diff --git a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java b/core/src/main/java/org/pivxj/crypto/DeterministicKey.java similarity index 98% rename from core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java rename to core/src/main/java/org/pivxj/crypto/DeterministicKey.java index fa4268cb3..ffec88ad1 100644 --- a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java +++ b/core/src/main/java/org/pivxj/crypto/DeterministicKey.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; -import org.bitcoinj.wallet.DeterministicKeyChain; -import org.bitcoinj.wallet.KeyChainGroup; +import org.pivxj.wallet.DeterministicKeyChain; import org.spongycastle.crypto.params.KeyParameter; import org.spongycastle.math.ec.ECPoint; @@ -33,7 +32,7 @@ import java.util.Arrays; import java.util.Comparator; -import static org.bitcoinj.core.Utils.HEX; +import static org.pivxj.core.Utils.HEX; import static com.google.common.base.Preconditions.*; /** @@ -341,7 +340,7 @@ public boolean isEncrypted() { } /** - * Returns this keys {@link org.bitcoinj.crypto.KeyCrypter} or the keycrypter of its parent key. + * Returns this keys {@link org.pivxj.crypto.KeyCrypter} or the keycrypter of its parent key. */ @Override @Nullable public KeyCrypter getKeyCrypter() { @@ -570,7 +569,7 @@ public static DeterministicKey deserialize(NetworkParameters params, byte[] seri /** * The creation time of a deterministic key is equal to that of its parent, unless this key is the root of a tree - * in which case the time is stored alongside the key as per normal, see {@link org.bitcoinj.core.ECKey#getCreationTimeSeconds()}. + * in which case the time is stored alongside the key as per normal, see {@link org.pivxj.core.ECKey#getCreationTimeSeconds()}. */ @Override public long getCreationTimeSeconds() { diff --git a/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java b/core/src/main/java/org/pivxj/crypto/EncryptableItem.java similarity index 90% rename from core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java rename to core/src/main/java/org/pivxj/crypto/EncryptableItem.java index 22c1fec3f..1fbaaac01 100644 --- a/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java +++ b/core/src/main/java/org/pivxj/crypto/EncryptableItem.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.wallet.Protos; +import org.pivxj.wallet.Protos; import javax.annotation.Nullable; /** * Provides a uniform way to access something that can be optionally encrypted with a - * {@link org.bitcoinj.crypto.KeyCrypter}, yielding an {@link org.bitcoinj.crypto.EncryptedData}, and + * {@link org.pivxj.crypto.KeyCrypter}, yielding an {@link org.pivxj.crypto.EncryptedData}, and * which can have a creation time associated with it. */ public interface EncryptableItem { diff --git a/core/src/main/java/org/bitcoinj/crypto/EncryptedData.java b/core/src/main/java/org/pivxj/crypto/EncryptedData.java similarity index 98% rename from core/src/main/java/org/bitcoinj/crypto/EncryptedData.java rename to core/src/main/java/org/pivxj/crypto/EncryptedData.java index 9214e3a46..b07b691df 100644 --- a/core/src/main/java/org/bitcoinj/crypto/EncryptedData.java +++ b/core/src/main/java/org/pivxj/crypto/EncryptedData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import com.google.common.base.Objects; import java.util.Arrays; diff --git a/core/src/main/java/org/bitcoinj/crypto/HDDerivationException.java b/core/src/main/java/org/pivxj/crypto/HDDerivationException.java similarity index 96% rename from core/src/main/java/org/bitcoinj/crypto/HDDerivationException.java rename to core/src/main/java/org/pivxj/crypto/HDDerivationException.java index 7fd930c11..a4e76cf79 100644 --- a/core/src/main/java/org/bitcoinj/crypto/HDDerivationException.java +++ b/core/src/main/java/org/pivxj/crypto/HDDerivationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; public class HDDerivationException extends RuntimeException { public HDDerivationException(String message) { diff --git a/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java b/core/src/main/java/org/pivxj/crypto/HDKeyDerivation.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java rename to core/src/main/java/org/pivxj/crypto/HDKeyDerivation.java index 8640617cf..e0a415c37 100644 --- a/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java +++ b/core/src/main/java/org/pivxj/crypto/HDKeyDerivation.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import com.google.common.collect.*; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.spongycastle.math.ec.*; import java.math.*; diff --git a/core/src/main/java/org/bitcoinj/crypto/HDUtils.java b/core/src/main/java/org/pivxj/crypto/HDUtils.java similarity index 98% rename from core/src/main/java/org/bitcoinj/crypto/HDUtils.java rename to core/src/main/java/org/pivxj/crypto/HDUtils.java index fb9581c9f..14822143d 100644 --- a/core/src/main/java/org/bitcoinj/crypto/HDUtils.java +++ b/core/src/main/java/org/pivxj/crypto/HDUtils.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.core.ECKey; +import org.pivxj.core.ECKey; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java b/core/src/main/java/org/pivxj/crypto/KeyCrypter.java similarity index 96% rename from core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java rename to core/src/main/java/org/pivxj/crypto/KeyCrypter.java index 2089e675a..b43e37606 100644 --- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java +++ b/core/src/main/java/org/pivxj/crypto/KeyCrypter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; +import org.pivxj.wallet.Protos.Wallet.EncryptionType; import org.spongycastle.crypto.params.KeyParameter; import java.io.Serializable; diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java b/core/src/main/java/org/pivxj/crypto/KeyCrypterException.java similarity index 97% rename from core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java rename to core/src/main/java/org/pivxj/crypto/KeyCrypterException.java index e65a1dedd..152d84b92 100644 --- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java +++ b/core/src/main/java/org/pivxj/crypto/KeyCrypterException.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; /** *

Exception to provide the following:

diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java b/core/src/main/java/org/pivxj/crypto/KeyCrypterScrypt.java similarity index 98% rename from core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java rename to core/src/main/java/org/pivxj/crypto/KeyCrypterScrypt.java index 6d4f72110..429170da6 100644 --- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java +++ b/core/src/main/java/org/pivxj/crypto/KeyCrypterScrypt.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import com.google.common.base.Objects; import com.google.protobuf.ByteString; import com.lambdaworks.crypto.SCrypt; -import org.bitcoinj.core.Utils; -import org.bitcoinj.wallet.Protos; -import org.bitcoinj.wallet.Protos.ScryptParameters; -import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; +import org.pivxj.core.Utils; +import org.pivxj.wallet.Protos; +import org.pivxj.wallet.Protos.ScryptParameters; +import org.pivxj.wallet.Protos.Wallet.EncryptionType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.crypto.BufferedBlockCipher; diff --git a/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java b/core/src/main/java/org/pivxj/crypto/LazyECPoint.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java rename to core/src/main/java/org/pivxj/crypto/LazyECPoint.java index 8d2e9cce3..0f003f570 100644 --- a/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java +++ b/core/src/main/java/org/pivxj/crypto/LazyECPoint.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import org.spongycastle.math.ec.ECCurve; import org.spongycastle.math.ec.ECFieldElement; diff --git a/core/src/main/java/org/bitcoinj/crypto/LinuxSecureRandom.java b/core/src/main/java/org/pivxj/crypto/LinuxSecureRandom.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/LinuxSecureRandom.java rename to core/src/main/java/org/pivxj/crypto/LinuxSecureRandom.java index 100f7e663..6923794c6 100644 --- a/core/src/main/java/org/bitcoinj/crypto/LinuxSecureRandom.java +++ b/core/src/main/java/org/pivxj/crypto/LinuxSecureRandom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import org.slf4j.*; diff --git a/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java b/core/src/main/java/org/pivxj/crypto/MnemonicCode.java similarity index 98% rename from core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java rename to core/src/main/java/org/pivxj/crypto/MnemonicCode.java index 7d7e57acb..b942aac64 100644 --- a/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java +++ b/core/src/main/java/org/pivxj/crypto/MnemonicCode.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.Utils; +import org.pivxj.core.Sha256Hash; +import org.pivxj.core.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ import java.util.Collections; import java.util.List; -import static org.bitcoinj.core.Utils.HEX; +import static org.pivxj.core.Utils.HEX; /** * A MnemonicCode object may be used to convert between binary seed values and diff --git a/core/src/main/java/org/bitcoinj/crypto/MnemonicException.java b/core/src/main/java/org/pivxj/crypto/MnemonicException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/crypto/MnemonicException.java rename to core/src/main/java/org/pivxj/crypto/MnemonicException.java index ff862f49c..7ea7b2e01 100644 --- a/core/src/main/java/org/bitcoinj/crypto/MnemonicException.java +++ b/core/src/main/java/org/pivxj/crypto/MnemonicException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; /** * Exceptions thrown by the MnemonicCode module. diff --git a/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java b/core/src/main/java/org/pivxj/crypto/PBKDF2SHA512.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java rename to core/src/main/java/org/pivxj/crypto/PBKDF2SHA512.java index 03cfa4198..145de717e 100644 --- a/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java +++ b/core/src/main/java/org/pivxj/crypto/PBKDF2SHA512.java @@ -21,7 +21,7 @@ * */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; diff --git a/core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java b/core/src/main/java/org/pivxj/crypto/TransactionSignature.java similarity index 96% rename from core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java rename to core/src/main/java/org/pivxj/crypto/TransactionSignature.java index 545804a1b..df5ee99d4 100644 --- a/core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java +++ b/core/src/main/java/org/pivxj/crypto/TransactionSignature.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.VerificationException; -import org.bitcoinj.core.Transaction.SigHash; +import org.pivxj.core.ECKey; +import org.pivxj.core.Transaction; +import org.pivxj.core.VerificationException; +import org.pivxj.core.Transaction.SigHash; import com.google.common.base.Preconditions; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; /** - * A TransactionSignature wraps an {@link org.bitcoinj.core.ECKey.ECDSASignature} and adds methods for handling + * A TransactionSignature wraps an {@link org.pivxj.core.ECKey.ECDSASignature} and adds methods for handling * the additional SIGHASH mode byte that is used. */ public class TransactionSignature extends ECKey.ECDSASignature { diff --git a/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java b/core/src/main/java/org/pivxj/crypto/TrustStoreLoader.java similarity index 99% rename from core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java rename to core/src/main/java/org/pivxj/crypto/TrustStoreLoader.java index a3542e8b0..94ae302e3 100644 --- a/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java +++ b/core/src/main/java/org/pivxj/crypto/TrustStoreLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import javax.annotation.Nonnull; import java.io.File; diff --git a/core/src/main/java/org/bitcoinj/crypto/X509Utils.java b/core/src/main/java/org/pivxj/crypto/X509Utils.java similarity index 94% rename from core/src/main/java/org/bitcoinj/crypto/X509Utils.java rename to core/src/main/java/org/pivxj/crypto/X509Utils.java index 074468f7b..a5d8857a3 100644 --- a/core/src/main/java/org/bitcoinj/crypto/X509Utils.java +++ b/core/src/main/java/org/pivxj/crypto/X509Utils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.crypto; +package org.pivxj.crypto; import com.google.common.base.Joiner; import org.spongycastle.asn1.ASN1ObjectIdentifier; @@ -38,8 +38,8 @@ /** * X509Utils provides tools for working with X.509 certificates and keystores, as used in the BIP 70 payment protocol. - * For more details on this, see {@link org.bitcoinj.protocols.payments.PaymentSession}, the article "Working with - * the payment protocol" on the bitcoinj website, or the Bitcoin developer guide. + * For more details on this, see {@link org.pivxj.protocols.payments.PaymentSession}, the article "Working with + * the payment protocol" on the pivxj website, or the Bitcoin developer guide. */ public class X509Utils { /** diff --git a/core/src/main/java/org/bitcoinj/crypto/package-info.java b/core/src/main/java/org/pivxj/crypto/package-info.java similarity index 97% rename from core/src/main/java/org/bitcoinj/crypto/package-info.java rename to core/src/main/java/org/pivxj/crypto/package-info.java index f3b1447da..a57a0ed41 100644 --- a/core/src/main/java/org/bitcoinj/crypto/package-info.java +++ b/core/src/main/java/org/pivxj/crypto/package-info.java @@ -19,4 +19,4 @@ * on strong crypto. This is legal because Oracle got permission to ship strong AES to everyone years ago but hasn't * bothered to actually remove the logic barriers. */ -package org.bitcoinj.crypto; \ No newline at end of file +package org.pivxj.crypto; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/jni/NativeBlockChainListener.java b/core/src/main/java/org/pivxj/jni/NativeBlockChainListener.java similarity index 88% rename from core/src/main/java/org/bitcoinj/jni/NativeBlockChainListener.java rename to core/src/main/java/org/pivxj/jni/NativeBlockChainListener.java index 4ce13e205..942ba56ed 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeBlockChainListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeBlockChainListener.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.util.List; -import org.bitcoinj.core.listeners.NewBestBlockListener; -import org.bitcoinj.core.listeners.ReorganizeListener; -import org.bitcoinj.core.listeners.TransactionReceivedInBlockListener; +import org.pivxj.core.listeners.NewBestBlockListener; +import org.pivxj.core.listeners.ReorganizeListener; +import org.pivxj.core.listeners.TransactionReceivedInBlockListener; /** * An event listener that relays events to a native C++ object. A pointer to that object is stored in diff --git a/core/src/main/java/org/bitcoinj/jni/NativeFutureCallback.java b/core/src/main/java/org/pivxj/jni/NativeFutureCallback.java similarity index 97% rename from core/src/main/java/org/bitcoinj/jni/NativeFutureCallback.java rename to core/src/main/java/org/pivxj/jni/NativeFutureCallback.java index bcf9d4dbd..b2ca6ea27 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeFutureCallback.java +++ b/core/src/main/java/org/pivxj/jni/NativeFutureCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; import com.google.common.util.concurrent.FutureCallback; diff --git a/core/src/main/java/org/bitcoinj/jni/NativeKeyChainEventListener.java b/core/src/main/java/org/pivxj/jni/NativeKeyChainEventListener.java similarity index 89% rename from core/src/main/java/org/bitcoinj/jni/NativeKeyChainEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeKeyChainEventListener.java index 6e1df674e..b1bb4db24 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeKeyChainEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeKeyChainEventListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.wallet.listeners.KeyChainEventListener; +import org.pivxj.core.ECKey; +import org.pivxj.wallet.listeners.KeyChainEventListener; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java b/core/src/main/java/org/pivxj/jni/NativePaymentChannelHandlerFactory.java similarity index 87% rename from core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java rename to core/src/main/java/org/pivxj/jni/NativePaymentChannelHandlerFactory.java index afee9c32c..51c2cd75c 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java +++ b/core/src/main/java/org/pivxj/jni/NativePaymentChannelHandlerFactory.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.protocols.channels.PaymentChannelServerListener; -import org.bitcoinj.protocols.channels.ServerConnectionEventHandler; +import org.pivxj.protocols.channels.PaymentChannelServerListener; +import org.pivxj.protocols.channels.ServerConnectionEventHandler; import javax.annotation.Nullable; import java.net.SocketAddress; diff --git a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java b/core/src/main/java/org/pivxj/jni/NativePaymentChannelServerConnectionEventHandler.java similarity index 87% rename from core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java rename to core/src/main/java/org/pivxj/jni/NativePaymentChannelServerConnectionEventHandler.java index a706cc5ac..357ca02e8 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java +++ b/core/src/main/java/org/pivxj/jni/NativePaymentChannelServerConnectionEventHandler.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.core.*; -import org.bitcoinj.protocols.channels.PaymentChannelCloseException; -import org.bitcoinj.protocols.channels.ServerConnectionEventHandler; +import org.pivxj.core.*; +import org.pivxj.protocols.channels.PaymentChannelCloseException; +import org.pivxj.protocols.channels.ServerConnectionEventHandler; import com.google.common.util.concurrent.ListenableFuture; import com.google.protobuf.ByteString; diff --git a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java b/core/src/main/java/org/pivxj/jni/NativePeerEventListener.java similarity index 95% rename from core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java rename to core/src/main/java/org/pivxj/jni/NativePeerEventListener.java index f9b160b83..846f20505 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativePeerEventListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.core.listeners.*; -import org.bitcoinj.core.*; +import org.pivxj.core.listeners.*; +import org.pivxj.core.*; import javax.annotation.*; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/jni/NativeScriptsChangeEventListener.java b/core/src/main/java/org/pivxj/jni/NativeScriptsChangeEventListener.java similarity index 87% rename from core/src/main/java/org/bitcoinj/jni/NativeScriptsChangeEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeScriptsChangeEventListener.java index 8abdaa75a..45de8786d 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeScriptsChangeEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeScriptsChangeEventListener.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.script.Script; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.ScriptsChangeEventListener; +import org.pivxj.script.Script; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.ScriptsChangeEventListener; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceEventListener.java b/core/src/main/java/org/pivxj/jni/NativeTransactionConfidenceEventListener.java similarity index 86% rename from core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeTransactionConfidenceEventListener.java index da8d93fac..6088d26a6 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeTransactionConfidenceEventListener.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.core.listeners.TransactionConfidenceEventListener; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.core.Transaction; +import org.pivxj.core.listeners.TransactionConfidenceEventListener; +import org.pivxj.wallet.Wallet; +import org.pivxj.core.Transaction; /** * An event listener that relays events to a native C++ object. A pointer to that object is stored in diff --git a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceListener.java b/core/src/main/java/org/pivxj/jni/NativeTransactionConfidenceListener.java similarity index 93% rename from core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceListener.java rename to core/src/main/java/org/pivxj/jni/NativeTransactionConfidenceListener.java index af656d4a4..7d43c658f 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeTransactionConfidenceListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeTransactionConfidenceListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.core.TransactionConfidence; +import org.pivxj.core.TransactionConfidence; /** * An event listener that relays events to a native C++ object. A pointer to that object is stored in diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletChangeEventListener.java b/core/src/main/java/org/pivxj/jni/NativeWalletChangeEventListener.java similarity index 89% rename from core/src/main/java/org/bitcoinj/jni/NativeWalletChangeEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeWalletChangeEventListener.java index 1c8db59e6..a16b73f0f 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletChangeEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeWalletChangeEventListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.WalletChangeEventListener; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.WalletChangeEventListener; /** * An event listener that relays events to a native C++ object. A pointer to that object is stored in diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsReceivedEventListener.java b/core/src/main/java/org/pivxj/jni/NativeWalletCoinsReceivedEventListener.java similarity index 84% rename from core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsReceivedEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeWalletCoinsReceivedEventListener.java index a57603a25..9b6e0ec6e 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsReceivedEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeWalletCoinsReceivedEventListener.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.Transaction; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.WalletCoinsReceivedEventListener; +import org.pivxj.core.Coin; +import org.pivxj.core.Transaction; /** * An event listener that relays events to a native C++ object. A pointer to that object is stored in diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsSentEventListener.java b/core/src/main/java/org/pivxj/jni/NativeWalletCoinsSentEventListener.java similarity index 84% rename from core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsSentEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeWalletCoinsSentEventListener.java index 102b58cd9..7188f96a3 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletCoinsSentEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeWalletCoinsSentEventListener.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.WalletCoinsSentEventListener; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.Transaction; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.WalletCoinsSentEventListener; +import org.pivxj.core.Coin; +import org.pivxj.core.Transaction; /** * An event listener that relays events to a native C++ object. A pointer to that object is stored in diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java b/core/src/main/java/org/pivxj/jni/NativeWalletEventListener.java similarity index 86% rename from core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeWalletEventListener.java index cddd86d97..2404e9c55 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeWalletEventListener.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.bitcoinj.jni; - -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.script.Script; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.WalletEventListener; +package org.pivxj.jni; + +import org.pivxj.core.Coin; +import org.pivxj.core.ECKey; +import org.pivxj.core.Transaction; +import org.pivxj.script.Script; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.WalletEventListener; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletReorganizeEventListener.java b/core/src/main/java/org/pivxj/jni/NativeWalletReorganizeEventListener.java similarity index 88% rename from core/src/main/java/org/bitcoinj/jni/NativeWalletReorganizeEventListener.java rename to core/src/main/java/org/pivxj/jni/NativeWalletReorganizeEventListener.java index ddc3f64c1..0053405e4 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativeWalletReorganizeEventListener.java +++ b/core/src/main/java/org/pivxj/jni/NativeWalletReorganizeEventListener.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.jni; +package org.pivxj.jni; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.WalletReorganizeEventListener; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.WalletReorganizeEventListener; /** * An event listener that relays events to a native C++ object. A pointer to that object is stored in diff --git a/core/src/main/java/org/bitcoinj/kits/LevelDBWalletAppKit.java b/core/src/main/java/org/pivxj/kits/LevelDBWalletAppKit.java similarity index 65% rename from core/src/main/java/org/bitcoinj/kits/LevelDBWalletAppKit.java rename to core/src/main/java/org/pivxj/kits/LevelDBWalletAppKit.java index 171d4a16c..aa07a3da2 100644 --- a/core/src/main/java/org/bitcoinj/kits/LevelDBWalletAppKit.java +++ b/core/src/main/java/org/pivxj/kits/LevelDBWalletAppKit.java @@ -1,11 +1,10 @@ -package org.bitcoinj.kits; +package org.pivxj.kits; -import org.bitcoinj.core.Context; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.store.LevelDBBlockStore; -import org.bitcoinj.store.SPVBlockStore; +import org.pivxj.core.NetworkParameters; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; +import org.pivxj.store.LevelDBBlockStore; +import org.pivxj.store.SPVBlockStore; import java.io.File; diff --git a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java b/core/src/main/java/org/pivxj/kits/WalletAppKit.java similarity index 97% rename from core/src/main/java/org/bitcoinj/kits/WalletAppKit.java rename to core/src/main/java/org/pivxj/kits/WalletAppKit.java index e5ea79bd8..08c8c6c84 100644 --- a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java +++ b/core/src/main/java/org/pivxj/kits/WalletAppKit.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.bitcoinj.kits; +package org.pivxj.kits; import com.google.common.collect.*; import com.google.common.util.concurrent.*; import com.subgraph.orchid.*; -import org.bitcoinj.core.listeners.*; -import org.bitcoinj.core.*; -import org.bitcoinj.net.discovery.*; -import org.bitcoinj.protocols.channels.*; -import org.bitcoinj.store.*; -import org.bitcoinj.wallet.*; +import org.pivxj.core.listeners.*; +import org.pivxj.core.*; +import org.pivxj.net.discovery.*; +import org.pivxj.protocols.channels.*; +import org.pivxj.store.*; +import org.pivxj.wallet.*; import org.slf4j.*; import javax.annotation.*; @@ -38,7 +38,7 @@ import static com.google.common.base.Preconditions.*; /** - *

Utility class that wraps the boilerplate needed to set up a new SPV bitcoinj app. Instantiate it with a directory + *

Utility class that wraps the boilerplate needed to set up a new SPV pivxj app. Instantiate it with a directory * and file prefix, optionally configure a few things, then use startAsync and optionally awaitRunning. The object will * construct and configure a {@link BlockChain}, {@link SPVBlockStore}, {@link Wallet} and {@link PeerGroup}. Depending * on the value of the blockingStartup property, startup will be considered complete once the block chain has fully @@ -50,8 +50,8 @@ * access the objects this class creates until startup is complete.

* *

The asynchronous design of this class may seem puzzling (just use {@link #awaitRunning()} if you don't want that). - * It is to make it easier to fit bitcoinj into GUI apps, which require a high degree of responsiveness on their main - * thread which handles all the animation and user interaction. Even when blockingStart is false, initializing bitcoinj + * It is to make it easier to fit pivxj into GUI apps, which require a high degree of responsiveness on their main + * thread which handles all the animation and user interaction. Even when blockingStart is false, initializing pivxj * means doing potentially blocking file IO, generating keys and other potentially intensive operations. By running it * on a background thread, there's no risk of accidentally causing UI lag.

* @@ -135,7 +135,7 @@ public WalletAppKit setAutoSave(boolean value) { /** * If you want to learn about the sync process, you can provide a listener here. For instance, a - * {@link org.bitcoinj.core.DownloadProgressTracker} is a good choice. This has no effect unless setBlockingStartup(false) has been called + * {@link org.pivxj.core.DownloadProgressTracker} is a good choice. This has no effect unless setBlockingStartup(false) has been called * too, due to some missing implementation code. */ public WalletAppKit setDownloadListener(DownloadProgressTracker listener) { @@ -151,7 +151,7 @@ public WalletAppKit setAutoStop(boolean autoStop) { /** * If set, the file is expected to contain a checkpoints file calculated with BuildCheckpoints. It makes initial - * block sync faster for new users - please refer to the documentation on the bitcoinj website for further details. + * block sync faster for new users - please refer to the documentation on the pivxj website for further details. */ public WalletAppKit setCheckpoints(InputStream checkpoints) { if (this.checkpoints != null) diff --git a/core/src/main/java/org/bitcoinj/kits/package-info.java b/core/src/main/java/org/pivxj/kits/package-info.java similarity index 80% rename from core/src/main/java/org/bitcoinj/kits/package-info.java rename to core/src/main/java/org/pivxj/kits/package-info.java index efb678dd4..bc86cf751 100644 --- a/core/src/main/java/org/bitcoinj/kits/package-info.java +++ b/core/src/main/java/org/pivxj/kits/package-info.java @@ -13,7 +13,7 @@ */ /** - * High level wrapper APIs around the bitcoinj building blocks. WalletAppKit is suitable for many different types of + * High level wrapper APIs around the pivxj building blocks. WalletAppKit is suitable for many different types of * apps that require an SPV wallet. */ -package org.bitcoinj.kits; \ No newline at end of file +package org.pivxj.kits; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/net/AbstractTimeoutHandler.java b/core/src/main/java/org/pivxj/net/AbstractTimeoutHandler.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/AbstractTimeoutHandler.java rename to core/src/main/java/org/pivxj/net/AbstractTimeoutHandler.java index 43ad29884..65c656ce2 100644 --- a/core/src/main/java/org/bitcoinj/net/AbstractTimeoutHandler.java +++ b/core/src/main/java/org/pivxj/net/AbstractTimeoutHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import java.util.Timer; import java.util.TimerTask; diff --git a/core/src/main/java/org/bitcoinj/net/BlockingClient.java b/core/src/main/java/org/pivxj/net/BlockingClient.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/BlockingClient.java rename to core/src/main/java/org/pivxj/net/BlockingClient.java index a6762b269..18c68187e 100644 --- a/core/src/main/java/org/bitcoinj/net/BlockingClient.java +++ b/core/src/main/java/org/pivxj/net/BlockingClient.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import com.google.common.util.concurrent.*; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.*; import javax.annotation.*; diff --git a/core/src/main/java/org/bitcoinj/net/BlockingClientManager.java b/core/src/main/java/org/pivxj/net/BlockingClientManager.java similarity index 97% rename from core/src/main/java/org/bitcoinj/net/BlockingClientManager.java rename to core/src/main/java/org/pivxj/net/BlockingClientManager.java index afce21361..9fefdaca6 100644 --- a/core/src/main/java/org/bitcoinj/net/BlockingClientManager.java +++ b/core/src/main/java/org/pivxj/net/BlockingClientManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import com.google.common.util.concurrent.AbstractIdleService; import com.google.common.util.concurrent.ListenableFuture; @@ -48,7 +48,7 @@ public BlockingClientManager() { /** * Creates a blocking client manager that will obtain sockets from the given factory. Useful for customising how - * bitcoinj connects to the P2P network. + * pivxj connects to the P2P network. */ public BlockingClientManager(SocketFactory socketFactory) { this.socketFactory = checkNotNull(socketFactory); diff --git a/core/src/main/java/org/bitcoinj/net/ClientConnectionManager.java b/core/src/main/java/org/pivxj/net/ClientConnectionManager.java similarity index 98% rename from core/src/main/java/org/bitcoinj/net/ClientConnectionManager.java rename to core/src/main/java/org/pivxj/net/ClientConnectionManager.java index 23d493436..d0933d7f1 100644 --- a/core/src/main/java/org/bitcoinj/net/ClientConnectionManager.java +++ b/core/src/main/java/org/pivxj/net/ClientConnectionManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Service; diff --git a/core/src/main/java/org/bitcoinj/net/ConnectionHandler.java b/core/src/main/java/org/pivxj/net/ConnectionHandler.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/ConnectionHandler.java rename to core/src/main/java/org/pivxj/net/ConnectionHandler.java index 8f2bfe6cd..848c66c56 100644 --- a/core/src/main/java/org/bitcoinj/net/ConnectionHandler.java +++ b/core/src/main/java/org/pivxj/net/ConnectionHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; -import org.bitcoinj.core.Message; -import org.bitcoinj.utils.Threading; +import org.pivxj.core.Message; +import org.pivxj.utils.Threading; import com.google.common.base.Throwables; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/net/FilterMerger.java b/core/src/main/java/org/pivxj/net/FilterMerger.java similarity index 94% rename from core/src/main/java/org/bitcoinj/net/FilterMerger.java rename to core/src/main/java/org/pivxj/net/FilterMerger.java index 53a718b3c..c5aba9045 100644 --- a/core/src/main/java/org/bitcoinj/net/FilterMerger.java +++ b/core/src/main/java/org/pivxj/net/FilterMerger.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import com.google.common.collect.Lists; -import org.bitcoinj.core.BloomFilter; -import org.bitcoinj.core.PeerFilterProvider; +import org.pivxj.core.BloomFilter; +import org.pivxj.core.PeerFilterProvider; import com.google.common.collect.ImmutableList; import java.util.LinkedList; @@ -24,9 +24,9 @@ // This code is unit tested by the PeerGroup tests. /** - *

A reusable object that will calculate, given a list of {@link org.bitcoinj.core.PeerFilterProvider}s, a merged - * {@link org.bitcoinj.core.BloomFilter} and earliest key time for all of them. - * Used by the {@link org.bitcoinj.core.PeerGroup} class internally.

+ *

A reusable object that will calculate, given a list of {@link org.pivxj.core.PeerFilterProvider}s, a merged + * {@link org.pivxj.core.BloomFilter} and earliest key time for all of them. + * Used by the {@link org.pivxj.core.PeerGroup} class internally.

* *

Thread safety: threading here can be complicated. Each filter provider is given a begin event, which may acquire * a lock (and is guaranteed to receive an end event). This class is mostly thread unsafe and is meant to be used from a diff --git a/core/src/main/java/org/bitcoinj/net/MessageWriteTarget.java b/core/src/main/java/org/pivxj/net/MessageWriteTarget.java similarity index 97% rename from core/src/main/java/org/bitcoinj/net/MessageWriteTarget.java rename to core/src/main/java/org/pivxj/net/MessageWriteTarget.java index 7679b7304..f7cd0c1bd 100644 --- a/core/src/main/java/org/bitcoinj/net/MessageWriteTarget.java +++ b/core/src/main/java/org/pivxj/net/MessageWriteTarget.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import java.io.IOException; diff --git a/core/src/main/java/org/bitcoinj/net/NioClient.java b/core/src/main/java/org/pivxj/net/NioClient.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/NioClient.java rename to core/src/main/java/org/pivxj/net/NioClient.java index df8f96882..1ee1e6c75 100644 --- a/core/src/main/java/org/bitcoinj/net/NioClient.java +++ b/core/src/main/java/org/pivxj/net/NioClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import com.google.common.base.*; import com.google.common.util.concurrent.*; diff --git a/core/src/main/java/org/bitcoinj/net/NioClientManager.java b/core/src/main/java/org/pivxj/net/NioClientManager.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/NioClientManager.java rename to core/src/main/java/org/pivxj/net/NioClientManager.java index a79c5f336..d595d87fe 100644 --- a/core/src/main/java/org/bitcoinj/net/NioClientManager.java +++ b/core/src/main/java/org/pivxj/net/NioClientManager.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import com.google.common.base.Throwables; import com.google.common.util.concurrent.*; -import org.bitcoinj.utils.*; +import org.pivxj.utils.*; import org.slf4j.LoggerFactory; import java.io.IOException; diff --git a/core/src/main/java/org/bitcoinj/net/NioServer.java b/core/src/main/java/org/pivxj/net/NioServer.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/NioServer.java rename to core/src/main/java/org/pivxj/net/NioServer.java index cfe025186..0a5d761af 100644 --- a/core/src/main/java/org/bitcoinj/net/NioServer.java +++ b/core/src/main/java/org/pivxj/net/NioServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/core/src/main/java/org/bitcoinj/net/ProtobufConnection.java b/core/src/main/java/org/pivxj/net/ProtobufConnection.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/ProtobufConnection.java rename to core/src/main/java/org/pivxj/net/ProtobufConnection.java index dec49870e..0122fd3e1 100644 --- a/core/src/main/java/org/bitcoinj/net/ProtobufConnection.java +++ b/core/src/main/java/org/pivxj/net/ProtobufConnection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; -import org.bitcoinj.core.Utils; -import org.bitcoinj.utils.Threading; +import org.pivxj.core.Utils; +import org.pivxj.utils.Threading; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.ByteString; import com.google.protobuf.MessageLite; diff --git a/core/src/main/java/org/bitcoinj/net/StreamConnection.java b/core/src/main/java/org/pivxj/net/StreamConnection.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/StreamConnection.java rename to core/src/main/java/org/pivxj/net/StreamConnection.java index 40b4caf11..44d2b13f8 100644 --- a/core/src/main/java/org/bitcoinj/net/StreamConnection.java +++ b/core/src/main/java/org/pivxj/net/StreamConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import java.nio.ByteBuffer; diff --git a/core/src/main/java/org/bitcoinj/net/StreamConnectionFactory.java b/core/src/main/java/org/pivxj/net/StreamConnectionFactory.java similarity index 97% rename from core/src/main/java/org/bitcoinj/net/StreamConnectionFactory.java rename to core/src/main/java/org/pivxj/net/StreamConnectionFactory.java index 2a64bdcaf..37d0bf162 100644 --- a/core/src/main/java/org/bitcoinj/net/StreamConnectionFactory.java +++ b/core/src/main/java/org/pivxj/net/StreamConnectionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net; +package org.pivxj.net; import java.net.InetAddress; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java b/core/src/main/java/org/pivxj/net/discovery/DnsDiscovery.java similarity index 97% rename from core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java rename to core/src/main/java/org/pivxj/net/discovery/DnsDiscovery.java index 1d05a8379..492abf253 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java +++ b/core/src/main/java/org/pivxj/net/discovery/DnsDiscovery.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.bitcoinj.net.discovery; +package org.pivxj.net.discovery; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.*; +import org.pivxj.core.*; +import org.pivxj.utils.*; import java.net.*; import java.util.*; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java b/core/src/main/java/org/pivxj/net/discovery/HttpDiscovery.java similarity index 98% rename from core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java rename to core/src/main/java/org/pivxj/net/discovery/HttpDiscovery.java index f46b07113..822bb97ef 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java +++ b/core/src/main/java/org/pivxj/net/discovery/HttpDiscovery.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.bitcoinj.net.discovery; +package org.pivxj.net.discovery; import com.google.common.annotations.*; import com.google.protobuf.*; import com.squareup.okhttp.*; import org.bitcoin.crawler.*; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.*; import javax.annotation.*; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java b/core/src/main/java/org/pivxj/net/discovery/MultiplexingDiscovery.java similarity index 95% rename from core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java rename to core/src/main/java/org/pivxj/net/discovery/MultiplexingDiscovery.java index fbd003954..6ec2b9dd8 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java +++ b/core/src/main/java/org/pivxj/net/discovery/MultiplexingDiscovery.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package org.bitcoinj.net.discovery; +package org.pivxj.net.discovery; import com.google.common.collect.Lists; import com.squareup.okhttp.OkHttpClient; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.VersionMessage; -import org.bitcoinj.net.discovery.HttpDiscovery; -import org.bitcoinj.net.discovery.DnsDiscovery.DnsSeedDiscovery; -import org.bitcoinj.utils.*; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.VersionMessage; +import org.pivxj.net.discovery.DnsDiscovery.DnsSeedDiscovery; +import org.pivxj.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscovery.java b/core/src/main/java/org/pivxj/net/discovery/PeerDiscovery.java similarity index 97% rename from core/src/main/java/org/bitcoinj/net/discovery/PeerDiscovery.java rename to core/src/main/java/org/pivxj/net/discovery/PeerDiscovery.java index 72452c25d..62bc74f21 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscovery.java +++ b/core/src/main/java/org/pivxj/net/discovery/PeerDiscovery.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.net.discovery; +package org.pivxj.net.discovery; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscoveryException.java b/core/src/main/java/org/pivxj/net/discovery/PeerDiscoveryException.java similarity index 96% rename from core/src/main/java/org/bitcoinj/net/discovery/PeerDiscoveryException.java rename to core/src/main/java/org/pivxj/net/discovery/PeerDiscoveryException.java index 585d19b5d..b4d010618 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscoveryException.java +++ b/core/src/main/java/org/pivxj/net/discovery/PeerDiscoveryException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.net.discovery; +package org.pivxj.net.discovery; public class PeerDiscoveryException extends Exception { private static final long serialVersionUID = -2863411151549391392L; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java b/core/src/main/java/org/pivxj/net/discovery/SeedPeers.java similarity index 98% rename from core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java rename to core/src/main/java/org/pivxj/net/discovery/SeedPeers.java index b44b4ee7e..66e435900 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java +++ b/core/src/main/java/org/pivxj/net/discovery/SeedPeers.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.net.discovery; +package org.pivxj.net.discovery; -import org.bitcoinj.core.NetworkParameters; +import org.pivxj.core.NetworkParameters; import javax.annotation.Nullable; import java.net.InetAddress; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java b/core/src/main/java/org/pivxj/net/discovery/TorDiscovery.java similarity index 99% rename from core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java rename to core/src/main/java/org/pivxj/net/discovery/TorDiscovery.java index e17100a68..a40c990c2 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java +++ b/core/src/main/java/org/pivxj/net/discovery/TorDiscovery.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.bitcoinj.net.discovery; +package org.pivxj.net.discovery; import com.google.common.collect.*; import com.google.common.util.concurrent.*; @@ -23,8 +23,8 @@ import com.subgraph.orchid.circuits.path.*; import com.subgraph.orchid.data.*; import com.subgraph.orchid.data.exitpolicy.*; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.*; +import org.pivxj.core.*; +import org.pivxj.utils.*; import org.slf4j.*; import java.net.*; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java b/core/src/main/java/org/pivxj/net/discovery/package-info.java similarity index 95% rename from core/src/main/java/org/bitcoinj/net/discovery/package-info.java rename to core/src/main/java/org/pivxj/net/discovery/package-info.java index d54d6e3e5..cca35aa48 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java +++ b/core/src/main/java/org/pivxj/net/discovery/package-info.java @@ -15,4 +15,4 @@ /** * Classes that know how to discover peers in the P2P network using DNS, IRC or DNS via Tor (orchid). */ -package org.bitcoinj.net.discovery; \ No newline at end of file +package org.pivxj.net.discovery; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/net/package-info.java b/core/src/main/java/org/pivxj/net/package-info.java similarity index 89% rename from core/src/main/java/org/bitcoinj/net/package-info.java rename to core/src/main/java/org/pivxj/net/package-info.java index 48249a611..efc99f9cd 100644 --- a/core/src/main/java/org/bitcoinj/net/package-info.java +++ b/core/src/main/java/org/pivxj/net/package-info.java @@ -15,6 +15,6 @@ /** * Classes handling low level network management using either NIO (async io) or older style blocking sockets (useful for * using SOCKS proxies, Tor, SSL etc). The code in this package implements a simple network abstraction a little like - * what the Netty library provides, but with only what bitcoinj needs. + * what the Netty library provides, but with only what pivxj needs. */ -package org.bitcoinj.net; \ No newline at end of file +package org.pivxj.net; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java b/core/src/main/java/org/pivxj/params/AbstractBitcoinNetParams.java similarity index 96% rename from core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java rename to core/src/main/java/org/pivxj/params/AbstractBitcoinNetParams.java index d769322f5..d29e33768 100644 --- a/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java +++ b/core/src/main/java/org/pivxj/params/AbstractBitcoinNetParams.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package org.bitcoinj.params; +package org.pivxj.params; import java.math.BigInteger; import java.util.concurrent.TimeUnit; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.MonetaryFormat; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; -import org.bitcoinj.utils.MonetaryFormat; +import org.pivxj.core.*; +import org.pivxj.utils.MonetaryFormat; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/params/MainNetParams.java b/core/src/main/java/org/pivxj/params/MainNetParams.java similarity index 98% rename from core/src/main/java/org/bitcoinj/params/MainNetParams.java rename to core/src/main/java/org/pivxj/params/MainNetParams.java index b4ffbf6a9..d708772c0 100644 --- a/core/src/main/java/org/bitcoinj/params/MainNetParams.java +++ b/core/src/main/java/org/pivxj/params/MainNetParams.java @@ -15,12 +15,9 @@ * limitations under the License. */ -package org.bitcoinj.params; +package org.pivxj.params; -import org.bitcoinj.core.*; -import org.bitcoinj.net.discovery.*; - -import java.net.*; +import org.pivxj.core.*; import static com.google.common.base.Preconditions.*; diff --git a/core/src/main/java/org/bitcoinj/params/Networks.java b/core/src/main/java/org/pivxj/params/Networks.java similarity index 96% rename from core/src/main/java/org/bitcoinj/params/Networks.java rename to core/src/main/java/org/pivxj/params/Networks.java index 03082ad06..981d957c9 100644 --- a/core/src/main/java/org/bitcoinj/params/Networks.java +++ b/core/src/main/java/org/pivxj/params/Networks.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.params; +package org.pivxj.params; -import org.bitcoinj.core.NetworkParameters; +import org.pivxj.core.NetworkParameters; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; diff --git a/core/src/main/java/org/bitcoinj/params/RegTestParams.java b/core/src/main/java/org/pivxj/params/RegTestParams.java similarity index 97% rename from core/src/main/java/org/bitcoinj/params/RegTestParams.java rename to core/src/main/java/org/pivxj/params/RegTestParams.java index e1cfc0162..eb6ce8fa3 100644 --- a/core/src/main/java/org/bitcoinj/params/RegTestParams.java +++ b/core/src/main/java/org/pivxj/params/RegTestParams.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.params; +package org.pivxj.params; -import org.bitcoinj.core.Block; +import org.pivxj.core.Block; import java.math.BigInteger; diff --git a/core/src/main/java/org/bitcoinj/params/TestNet2Params.java b/core/src/main/java/org/pivxj/params/TestNet2Params.java similarity index 96% rename from core/src/main/java/org/bitcoinj/params/TestNet2Params.java rename to core/src/main/java/org/pivxj/params/TestNet2Params.java index 0c211d802..9ff88e9cc 100644 --- a/core/src/main/java/org/bitcoinj/params/TestNet2Params.java +++ b/core/src/main/java/org/pivxj/params/TestNet2Params.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.params; +package org.pivxj.params; -import org.bitcoinj.core.CoinDefinition; -import org.bitcoinj.core.Utils; +import org.pivxj.core.CoinDefinition; import static com.google.common.base.Preconditions.checkState; diff --git a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java b/core/src/main/java/org/pivxj/params/TestNet3Params.java similarity index 94% rename from core/src/main/java/org/bitcoinj/params/TestNet3Params.java rename to core/src/main/java/org/pivxj/params/TestNet3Params.java index 6673129ab..d03ef7ed1 100644 --- a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java +++ b/core/src/main/java/org/pivxj/params/TestNet3Params.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.bitcoinj.params; +package org.pivxj.params; -import org.bitcoinj.core.CoinDefinition; +import org.pivxj.core.CoinDefinition; import java.math.BigInteger; import java.util.Date; -import org.bitcoinj.core.Block; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.StoredBlock; -import org.bitcoinj.core.VerificationException; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; +import org.pivxj.core.Block; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.StoredBlock; +import org.pivxj.core.VerificationException; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; import static com.google.common.base.Preconditions.checkState; diff --git a/core/src/main/java/org/bitcoinj/params/UnitTestParams.java b/core/src/main/java/org/pivxj/params/UnitTestParams.java similarity index 89% rename from core/src/main/java/org/bitcoinj/params/UnitTestParams.java rename to core/src/main/java/org/pivxj/params/UnitTestParams.java index 8120a3302..3ab9fa366 100644 --- a/core/src/main/java/org/bitcoinj/params/UnitTestParams.java +++ b/core/src/main/java/org/pivxj/params/UnitTestParams.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.bitcoinj.params; +package org.pivxj.params; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.math.BigInteger; /** - * Network parameters used by the bitcoinj unit tests (and potentially your own). This lets you solve a block using - * {@link org.bitcoinj.core.Block#solve()} by setting difficulty to the easiest possible. + * Network parameters used by the pivxj unit tests (and potentially your own). This lets you solve a block using + * {@link org.pivxj.core.Block#solve()} by setting difficulty to the easiest possible. */ public class UnitTestParams extends AbstractBitcoinNetParams { public static final int UNITNET_MAJORITY_WINDOW = 8; diff --git a/core/src/main/java/org/bitcoinj/params/package-info.java b/core/src/main/java/org/pivxj/params/package-info.java similarity index 96% rename from core/src/main/java/org/bitcoinj/params/package-info.java rename to core/src/main/java/org/pivxj/params/package-info.java index a0e1697c5..d3cc473c2 100644 --- a/core/src/main/java/org/bitcoinj/params/package-info.java +++ b/core/src/main/java/org/pivxj/params/package-info.java @@ -16,4 +16,4 @@ * Network parameters encapsulate some of the differences between different Bitcoin networks such as the main * network, the testnet, regtest mode, unit testing params and so on. */ -package org.bitcoinj.params; \ No newline at end of file +package org.pivxj.params; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java b/core/src/main/java/org/pivxj/protocols/channels/ClientState.java similarity index 85% rename from core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java rename to core/src/main/java/org/pivxj/protocols/channels/ClientState.java index a3e0db62c..5f87c71a0 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/ClientState.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: storedclientpaymentchannel.proto -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; public final class ClientState { private ClientState() {} @@ -15,12 +15,12 @@ public interface StoredClientPaymentChannelsOrBuilder extends /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - java.util.List + java.util.List getChannelsList(); /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getChannels(int index); + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel getChannels(int index); /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ @@ -28,12 +28,12 @@ public interface StoredClientPaymentChannelsOrBuilder extends /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - java.util.List + java.util.List getChannelsOrBuilderList(); /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder getChannelsOrBuilder( + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder getChannelsOrBuilder( int index); } /** @@ -94,10 +94,10 @@ private StoredClientPaymentChannels( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - channels_ = new java.util.ArrayList(); + channels_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - channels_.add(input.readMessage(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.PARSER, extensionRegistry)); + channels_.add(input.readMessage(org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.PARSER, extensionRegistry)); break; } } @@ -117,14 +117,14 @@ private StoredClientPaymentChannels( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.class, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.Builder.class); + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels.class, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -143,17 +143,17 @@ public com.google.protobuf.Parser getParserForType( } public static final int CHANNELS_FIELD_NUMBER = 1; - private java.util.List channels_; + private java.util.List channels_; /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public java.util.List getChannelsList() { + public java.util.List getChannelsList() { return channels_; } /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public java.util.List + public java.util.List getChannelsOrBuilderList() { return channels_; } @@ -166,13 +166,13 @@ public int getChannelsCount() { /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getChannels(int index) { + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel getChannels(int index) { return channels_.get(index); } /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder getChannelsOrBuilder( + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder getChannelsOrBuilder( int index) { return channels_.get(index); } @@ -227,53 +227,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(byte[] data) + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseDelimitedFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -282,7 +282,7 @@ public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentCha public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels prototype) { + public static Builder newBuilder(org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -303,20 +303,20 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:paymentchannels.StoredClientPaymentChannels) - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelsOrBuilder { + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.class, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.Builder.class); + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels.class, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels.Builder.class); } - // Construct using org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.newBuilder() + // Construct using org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -352,23 +352,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; } - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() { - return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.getDefaultInstance(); + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() { + return org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels.getDefaultInstance(); } - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels build() { - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = buildPartial(); + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels build() { + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels buildPartial() { - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels(this); + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels buildPartial() { + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels result = new org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels(this); int from_bitField0_ = bitField0_; if (channelsBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -384,16 +384,16 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels b } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels) { - return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels)other); + if (other instanceof org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels) { + return mergeFrom((org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels other) { - if (other == org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels other) { + if (other == org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels.getDefaultInstance()) return this; if (channelsBuilder_ == null) { if (!other.channels_.isEmpty()) { if (channels_.isEmpty()) { @@ -438,11 +438,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parsedMessage = null; + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannels) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -453,22 +453,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List channels_ = + private java.util.List channels_ = java.util.Collections.emptyList(); private void ensureChannelsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - channels_ = new java.util.ArrayList(channels_); + channels_ = new java.util.ArrayList(channels_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder> channelsBuilder_; + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder> channelsBuilder_; /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public java.util.List getChannelsList() { + public java.util.List getChannelsList() { if (channelsBuilder_ == null) { return java.util.Collections.unmodifiableList(channels_); } else { @@ -488,7 +488,7 @@ public int getChannelsCount() { /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getChannels(int index) { + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel getChannels(int index) { if (channelsBuilder_ == null) { return channels_.get(index); } else { @@ -499,7 +499,7 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel ge * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ public Builder setChannels( - int index, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel value) { + int index, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel value) { if (channelsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -516,7 +516,7 @@ public Builder setChannels( * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ public Builder setChannels( - int index, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder builderForValue) { + int index, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder builderForValue) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); channels_.set(index, builderForValue.build()); @@ -529,7 +529,7 @@ public Builder setChannels( /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public Builder addChannels(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel value) { + public Builder addChannels(org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel value) { if (channelsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -546,7 +546,7 @@ public Builder addChannels(org.bitcoinj.protocols.channels.ClientState.StoredCli * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ public Builder addChannels( - int index, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel value) { + int index, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel value) { if (channelsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -563,7 +563,7 @@ public Builder addChannels( * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ public Builder addChannels( - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder builderForValue) { + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder builderForValue) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); channels_.add(builderForValue.build()); @@ -577,7 +577,7 @@ public Builder addChannels( * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ public Builder addChannels( - int index, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder builderForValue) { + int index, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder builderForValue) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); channels_.add(index, builderForValue.build()); @@ -591,7 +591,7 @@ public Builder addChannels( * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ public Builder addAllChannels( - java.lang.Iterable values) { + java.lang.Iterable values) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -631,14 +631,14 @@ public Builder removeChannels(int index) { /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder getChannelsBuilder( + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder getChannelsBuilder( int index) { return getChannelsFieldBuilder().getBuilder(index); } /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder getChannelsOrBuilder( + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder getChannelsOrBuilder( int index) { if (channelsBuilder_ == null) { return channels_.get(index); } else { @@ -648,7 +648,7 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrB /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public java.util.List + public java.util.List getChannelsOrBuilderList() { if (channelsBuilder_ != null) { return channelsBuilder_.getMessageOrBuilderList(); @@ -659,31 +659,31 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrB /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder addChannelsBuilder() { + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder addChannelsBuilder() { return getChannelsFieldBuilder().addBuilder( - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance()); + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance()); } /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder addChannelsBuilder( + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder addChannelsBuilder( int index) { return getChannelsFieldBuilder().addBuilder( - index, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance()); + index, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance()); } /** * repeated .paymentchannels.StoredClientPaymentChannel channels = 1; */ - public java.util.List + public java.util.List getChannelsBuilderList() { return getChannelsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder> + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder> getChannelsFieldBuilder() { if (channelsBuilder_ == null) { channelsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder>( + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder>( channels_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -977,14 +977,14 @@ private StoredClientPaymentChannel( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.class, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder.class); + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.class, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1364,53 +1364,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(byte[] data) + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseDelimitedFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1419,7 +1419,7 @@ public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentCha public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel prototype) { + public static Builder newBuilder(org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1441,20 +1441,20 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:paymentchannels.StoredClientPaymentChannel) - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder { + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.class, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder.class); + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.class, org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder.class); } - // Construct using org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.newBuilder() + // Construct using org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1505,23 +1505,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; + return org.pivxj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; } - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() { - return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance(); + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() { + return org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance(); } - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel build() { - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = buildPartial(); + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel build() { + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel buildPartial() { - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel(this); + public org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel buildPartial() { + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel result = new org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1574,16 +1574,16 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel bu } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel) { - return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel)other); + if (other instanceof org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel) { + return mergeFrom((org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel other) { - if (other == org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel other) { + if (other == org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -1657,11 +1657,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parsedMessage = null; + org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.protocols.channels.ClientState.StoredClientPaymentChannel) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2173,7 +2173,7 @@ public Builder clearServerKey() { "\022\021\n\tvalueToMe\030\005 \002(\004\022\022\n\nrefundFees\030\006 \002(\004\022" + "\034\n\024closeTransactionHash\030\007 \001(\014\022\027\n\014majorVe" + "rsion\030\t \001(\r:\0011\022\022\n\nexpiryTime\030\n \001(\004\022\021\n\tse", - "rverKey\030\013 \001(\014B.\n\037org.bitcoinj.protocols." + + "rverKey\030\013 \001(\014B.\n\037org.pivxj.protocols." + "channelsB\013ClientState" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java b/core/src/main/java/org/pivxj/protocols/channels/IPaymentChannelClient.java similarity index 83% rename from core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java rename to core/src/main/java/org/pivxj/protocols/channels/IPaymentChannelClient.java index 398cf2cef..4239b6e6a 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java +++ b/core/src/main/java/org/pivxj/protocols/channels/IPaymentChannelClient.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.InsufficientMoneyException; +import org.pivxj.core.Coin; +import org.pivxj.core.ECKey; +import org.pivxj.core.InsufficientMoneyException; import com.google.common.util.concurrent.ListenableFuture; import com.google.protobuf.ByteString; @@ -46,7 +46,7 @@ public interface IPaymentChannelClient { * intending to reopen the channel later. There is likely little reason to use this in a stateless protocol.

* *

Note that this MUST still be called even after either - * {@link PaymentChannelClient.ClientConnection#destroyConnection(org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason)} or + * {@link PaymentChannelClient.ClientConnection#destroyConnection(org.pivxj.protocols.channels.PaymentChannelCloseException.CloseReason)} or * {@link IPaymentChannelClient#settle()} is called, to actually handle the connection close logic.

*/ void connectionClosed(); @@ -55,7 +55,7 @@ public interface IPaymentChannelClient { *

Settles the channel, notifying the server it can broadcast the most recent payment transaction.

* *

Note that this only generates a CLOSE message for the server and calls - * {@link PaymentChannelClient.ClientConnection#destroyConnection(org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason)} + * {@link PaymentChannelClient.ClientConnection#destroyConnection(org.pivxj.protocols.channels.PaymentChannelCloseException.CloseReason)} * to settle the connection, it does not actually handle connection close logic, and * {@link PaymentChannelClient#connectionClosed()} must still be called after the connection fully settles.

* @@ -102,25 +102,25 @@ interface ClientConnection { * however the order of messages must be preserved.

* *

If the send fails, no exception should be thrown, however - * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#connectionClosed()} should be called immediately. In the case of messages which + * {@link org.pivxj.protocols.channels.PaymentChannelClient#connectionClosed()} should be called immediately. In the case of messages which * are a part of initialization, initialization will simply fail and the refund transaction will be broadcasted * when it unlocks (if necessary). In the case of a payment message, the payment will be lost however if the * channel is resumed it will begin again from the channel value after the failed payment.

* - *

Called while holding a lock on the {@link org.bitcoinj.protocols.channels.PaymentChannelClient} object - be careful about reentrancy

+ *

Called while holding a lock on the {@link org.pivxj.protocols.channels.PaymentChannelClient} object - be careful about reentrancy

*/ void sendToServer(Protos.TwoWayChannelMessage msg); /** *

Requests that the connection to the server be closed. For stateless protocols, note that after this call, * no more messages should be received from the server and this object is no longer usable. A - * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#connectionClosed()} event should be generated immediately after this call.

+ * {@link org.pivxj.protocols.channels.PaymentChannelClient#connectionClosed()} event should be generated immediately after this call.

* - *

Called while holding a lock on the {@link org.bitcoinj.protocols.channels.PaymentChannelClient} object - be careful about reentrancy

+ *

Called while holding a lock on the {@link org.pivxj.protocols.channels.PaymentChannelClient} object - be careful about reentrancy

* * @param reason The reason for the closure, see the individual values for more details. * It is usually safe to ignore this and treat any value below - * {@link org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason#CLIENT_REQUESTED_CLOSE} as "unrecoverable error" and all others as + * {@link org.pivxj.protocols.channels.PaymentChannelCloseException.CloseReason#CLIENT_REQUESTED_CLOSE} as "unrecoverable error" and all others as * "try again once and see if it works then" */ void destroyConnection(PaymentChannelCloseException.CloseReason reason); @@ -128,7 +128,7 @@ interface ClientConnection { /** *

Queries if the expire time proposed by server is acceptable. If false is return the channel - * will be closed with a {@link org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason#TIME_WINDOW_UNACCEPTABLE}.

+ * will be closed with a {@link org.pivxj.protocols.channels.PaymentChannelCloseException.CloseReason#TIME_WINDOW_UNACCEPTABLE}.

* @param expireTime The time, in seconds, when this channel will be closed by the server. Note this is in absolute time, i.e. seconds since 1970-01-01T00:00:00. * @return true if the proposed time is acceptable false otherwise. */ @@ -136,10 +136,10 @@ interface ClientConnection { /** *

Indicates the channel has been successfully opened and - * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#incrementPayment(Coin)} + * {@link org.pivxj.protocols.channels.PaymentChannelClient#incrementPayment(Coin)} * may be called at will.

* - *

Called while holding a lock on the {@link org.bitcoinj.protocols.channels.PaymentChannelClient} + *

Called while holding a lock on the {@link org.pivxj.protocols.channels.PaymentChannelClient} * object - be careful about reentrancy

* * @param wasInitiated If true, the channel is newly opened. If false, it was resumed. diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClient.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClient.java index 3bb0ed1b8..dbba94941 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClient.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; -import org.bitcoinj.core.*; -import org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.*; +import org.pivxj.protocols.channels.PaymentChannelCloseException.CloseReason; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.Wallet; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.ListenableFuture; @@ -214,7 +214,7 @@ public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Has * attempt will be made to resume that channel. * @param timeWindow The time in seconds, relative to now, on how long this channel should be kept open. Note that is is * a proposal to the server. The server may in turn propose something different. - * See {@link org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientConnection#acceptExpireTime(long)} + * See {@link org.pivxj.protocols.channels.IPaymentChannelClient.ClientConnection#acceptExpireTime(long)} * @param userKeySetup Key derived from a user password, used to decrypt myKey, if it is encrypted, during setup. * @param conn A callback listener which represents the connection to the server (forwards messages we generate to * the server) @@ -239,7 +239,7 @@ public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Has * attempt will be made to resume that channel. * @param timeWindow The time in seconds, relative to now, on how long this channel should be kept open. Note that is is * a proposal to the server. The server may in turn propose something different. - * See {@link org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientConnection#acceptExpireTime(long)} + * See {@link org.pivxj.protocols.channels.IPaymentChannelClient.ClientConnection#acceptExpireTime(long)} * @param userKeySetup Key derived from a user password, used to decrypt myKey, if it is encrypted, during setup. * @param conn A callback listener which represents the connection to the server (forwards messages we generate to * the server) @@ -566,7 +566,7 @@ private void receiveClose(Protos.TwoWayChannelMessage msg) throws VerificationEx * intending to reopen the channel later. There is likely little reason to use this in a stateless protocol.

* *

Note that this MUST still be called even after either - * {@link ClientConnection#destroyConnection(org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason)} or + * {@link ClientConnection#destroyConnection(org.pivxj.protocols.channels.PaymentChannelCloseException.CloseReason)} or * {@link PaymentChannelClient#settle()} is called, to actually handle the connection close logic.

*/ @Override diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClientConnection.java similarity index 97% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClientConnection.java index 43491ed85..802518efd 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClientConnection.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.InsufficientMoneyException; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.Utils; -import org.bitcoinj.net.NioClient; -import org.bitcoinj.net.ProtobufConnection; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.Coin; +import org.pivxj.core.ECKey; +import org.pivxj.core.InsufficientMoneyException; +import org.pivxj.core.Sha256Hash; +import org.pivxj.core.Utils; +import org.pivxj.net.NioClient; +import org.pivxj.net.ProtobufConnection; +import org.pivxj.wallet.Wallet; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; @@ -49,7 +49,7 @@ public class PaymentChannelClientConnection { /** * Attempts to open a new connection to and open a payment channel with the given host and port, blocking until the * connection is open. The server is requested to keep the channel open for - * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#DEFAULT_TIME_WINDOW} + * {@link org.pivxj.protocols.channels.PaymentChannelClient#DEFAULT_TIME_WINDOW} * seconds. If the server proposes a longer time the channel will be closed. * * @param server The host/port pair where the server is listening. @@ -75,7 +75,7 @@ public PaymentChannelClientConnection(InetSocketAddress server, int timeoutSecon /** * Attempts to open a new connection to and open a payment channel with the given host and port, blocking until the * connection is open. The server is requested to keep the channel open for - * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#DEFAULT_TIME_WINDOW} + * {@link org.pivxj.protocols.channels.PaymentChannelClient#DEFAULT_TIME_WINDOW} * seconds. If the server proposes a longer time the channel will be closed. * * @param server The host/port pair where the server is listening. diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClientState.java similarity index 97% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClientState.java index dd4e0b6cd..d78adfe08 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelClientState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; @@ -22,13 +22,13 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.SendRequest; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener; +import org.pivxj.core.*; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.SendRequest; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.listeners.WalletCoinsReceivedEventListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.crypto.params.KeyParameter; @@ -211,7 +211,7 @@ public synchronized State getState() { * Creates the initial multisig contract and incomplete refund transaction which can be requested at the appropriate * time using {@link PaymentChannelV1ClientState#getIncompleteRefundTransaction} and * {@link PaymentChannelV1ClientState#getContract()}. The way the contract is crafted can be adjusted by - * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.bitcoinj.wallet.Wallet.SendRequest)}. + * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.pivxj.wallet.Wallet.SendRequest)}. * By default unconfirmed coins are allowed to be used, as for micropayments the risk should be relatively low. * * @throws ValueOutOfRangeException if the value being used is too small to be accepted by the network @@ -225,7 +225,7 @@ public void initiate() throws ValueOutOfRangeException, InsufficientMoneyExcepti * Creates the initial multisig contract and incomplete refund transaction which can be requested at the appropriate * time using {@link PaymentChannelV1ClientState#getIncompleteRefundTransaction} and * {@link PaymentChannelV1ClientState#getContract()}. The way the contract is crafted can be adjusted by - * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.bitcoinj.wallet.Wallet.SendRequest)}. + * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.pivxj.wallet.Wallet.SendRequest)}. * By default unconfirmed coins are allowed to be used, as for micropayments the risk should be relatively low. * @param userKey Key derived from a user password, needed for any signing when the wallet is encrypted. * The wallet KeyCrypter is assumed. diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelCloseException.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelCloseException.java similarity index 92% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelCloseException.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelCloseException.java index 0c6d6773c..c5f3a11ca 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelCloseException.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelCloseException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; /** * Used to indicate that a channel was closed before it was expected to be closed. @@ -34,7 +34,7 @@ public enum CloseReason { // Values after here indicate its probably possible to try reopening channel again /** - *

The {@link org.bitcoinj.protocols.channels.PaymentChannelClient#settle()} method was called or the + *

The {@link org.pivxj.protocols.channels.PaymentChannelClient#settle()} method was called or the * client sent a CLOSE message.

*

As long as the server received the CLOSE message, this means that the channel is settling and the payment * transaction (if any) will be broadcast. If the client attempts to open a new connection, a new channel will @@ -43,7 +43,7 @@ public enum CloseReason { CLIENT_REQUESTED_CLOSE, /** - *

The {@link org.bitcoinj.protocols.channels.PaymentChannelServer#close()} method was called or server + *

The {@link org.pivxj.protocols.channels.PaymentChannelServer#close()} method was called or server * sent a CLOSE message.

* *

This may occur if the server opts to close the connection for some reason, or automatically if the channel diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServer.java similarity index 99% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServer.java index f53daf22b..02bb7fa47 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.collect.ImmutableMap; -import org.bitcoinj.core.*; -import org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.*; +import org.pivxj.protocols.channels.PaymentChannelCloseException.CloseReason; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.Wallet; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerListener.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServerListener.java similarity index 96% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerListener.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServerListener.java index 2881c0467..68b6e6bb5 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerListener.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServerListener.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; - -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.TransactionBroadcaster; -import org.bitcoinj.net.NioServer; -import org.bitcoinj.net.ProtobufConnection; -import org.bitcoinj.net.StreamConnectionFactory; -import org.bitcoinj.wallet.Wallet; +package org.pivxj.protocols.channels; + +import org.pivxj.core.Coin; +import org.pivxj.core.Sha256Hash; +import org.pivxj.core.TransactionBroadcaster; +import org.pivxj.net.NioServer; +import org.pivxj.net.ProtobufConnection; +import org.pivxj.net.StreamConnectionFactory; +import org.pivxj.wallet.Wallet; import com.google.common.util.concurrent.ListenableFuture; import com.google.protobuf.ByteString; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServerState.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServerState.java index a5c9a7854..99f8a2180 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelServerState.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; -import org.bitcoinj.wallet.SendRequest; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.wallet.SendRequest; +import org.pivxj.wallet.Wallet; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; @@ -25,9 +25,9 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; +import org.pivxj.core.*; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV1ClientState.java similarity index 97% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV1ClientState.java index 57d89887e..504645e10 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV1ClientState.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.bitcoinj.wallet.AllowUnconfirmedCoinSelector; -import org.bitcoinj.wallet.SendRequest; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.*; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; +import org.pivxj.wallet.AllowUnconfirmedCoinSelector; +import org.pivxj.wallet.SendRequest; +import org.pivxj.wallet.Wallet; import org.spongycastle.crypto.params.KeyParameter; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; @@ -116,7 +116,7 @@ public int getMajorVersion() { * Creates the initial multisig contract and incomplete refund transaction which can be requested at the appropriate * time using {@link PaymentChannelV1ClientState#getIncompleteRefundTransaction} and * {@link PaymentChannelV1ClientState#getContract()}. The way the contract is crafted can be adjusted by - * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.bitcoinj.core.Wallet.SendRequest)}. + * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.pivxj.core.Wallet.SendRequest)}. * By default unconfirmed coins are allowed to be used, as for micropayments the risk should be relatively low. * @param userKey Key derived from a user password, needed for any signing when the wallet is encrypted. * The wallet KeyCrypter is assumed. diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV1ServerState.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV1ServerState.java index 3bf1df3f5..2b74d889d 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV1ServerState.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.collect.*; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.bitcoinj.wallet.SendRequest; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.*; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; +import org.pivxj.wallet.SendRequest; +import org.pivxj.wallet.Wallet; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV2ClientState.java similarity index 96% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV2ClientState.java index c35470dd7..5bf259090 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV2ClientState.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.bitcoinj.wallet.AllowUnconfirmedCoinSelector; -import org.bitcoinj.wallet.SendRequest; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.*; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; +import org.pivxj.wallet.AllowUnconfirmedCoinSelector; +import org.pivxj.wallet.SendRequest; +import org.pivxj.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.crypto.params.KeyParameter; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV2ServerState.java similarity index 97% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV2ServerState.java index f15fcc54c..b1df5547e 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentChannelV2ServerState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; @@ -22,12 +22,12 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; -import org.bitcoinj.wallet.SendRequest; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.*; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; +import org.pivxj.wallet.SendRequest; +import org.pivxj.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java b/core/src/main/java/org/pivxj/protocols/channels/PaymentIncrementAck.java similarity index 93% rename from core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java rename to core/src/main/java/org/pivxj/protocols/channels/PaymentIncrementAck.java index 40da762e6..86692e370 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java +++ b/core/src/main/java/org/pivxj/protocols/channels/PaymentIncrementAck.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; -import org.bitcoinj.core.Coin; +import org.pivxj.core.Coin; import com.google.protobuf.ByteString; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ServerConnectionEventHandler.java b/core/src/main/java/org/pivxj/protocols/channels/ServerConnectionEventHandler.java similarity index 91% rename from core/src/main/java/org/bitcoinj/protocols/channels/ServerConnectionEventHandler.java rename to core/src/main/java/org/pivxj/protocols/channels/ServerConnectionEventHandler.java index 5751c2c6b..42fcea563 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ServerConnectionEventHandler.java +++ b/core/src/main/java/org/pivxj/protocols/channels/ServerConnectionEventHandler.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.net.ProtobufConnection; +import org.pivxj.core.Coin; +import org.pivxj.core.Sha256Hash; +import org.pivxj.net.ProtobufConnection; import com.google.common.util.concurrent.ListenableFuture; import com.google.protobuf.ByteString; @@ -43,8 +43,8 @@ public abstract class ServerConnectionEventHandler { *

Note that this does NOT actually broadcast the most recent payment transaction, which will be triggered * automatically when the channel times out by the {@link StoredPaymentChannelServerStates}, or manually by calling * {@link StoredPaymentChannelServerStates#closeChannel(StoredServerChannel)} with the channel returned by - * {@link StoredPaymentChannelServerStates#getChannel(org.bitcoinj.core.Sha256Hash)} with the id provided in - * {@link ServerConnectionEventHandler#channelOpen(org.bitcoinj.core.Sha256Hash)}

+ * {@link StoredPaymentChannelServerStates#getChannel(org.pivxj.core.Sha256Hash)} with the id provided in + * {@link ServerConnectionEventHandler#channelOpen(org.pivxj.core.Sha256Hash)}

*/ @SuppressWarnings("unchecked") // The warning 'unchecked call to write(MessageType)' being suppressed here comes from the build() diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java b/core/src/main/java/org/pivxj/protocols/channels/ServerState.java similarity index 82% rename from core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java rename to core/src/main/java/org/pivxj/protocols/channels/ServerState.java index 37db23c80..2aacf81c1 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java +++ b/core/src/main/java/org/pivxj/protocols/channels/ServerState.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: storedserverpaymentchannel.proto -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; public final class ServerState { private ServerState() {} @@ -15,12 +15,12 @@ public interface StoredServerPaymentChannelsOrBuilder extends /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - java.util.List + java.util.List getChannelsList(); /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getChannels(int index); + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel getChannels(int index); /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ @@ -28,12 +28,12 @@ public interface StoredServerPaymentChannelsOrBuilder extends /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - java.util.List + java.util.List getChannelsOrBuilderList(); /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder getChannelsOrBuilder( + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder getChannelsOrBuilder( int index); } /** @@ -94,10 +94,10 @@ private StoredServerPaymentChannels( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - channels_ = new java.util.ArrayList(); + channels_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - channels_.add(input.readMessage(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.PARSER, extensionRegistry)); + channels_.add(input.readMessage(org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.PARSER, extensionRegistry)); break; } } @@ -117,14 +117,14 @@ private StoredServerPaymentChannels( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.class, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.Builder.class); + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels.class, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -143,17 +143,17 @@ public com.google.protobuf.Parser getParserForType( } public static final int CHANNELS_FIELD_NUMBER = 1; - private java.util.List channels_; + private java.util.List channels_; /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public java.util.List getChannelsList() { + public java.util.List getChannelsList() { return channels_; } /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public java.util.List + public java.util.List getChannelsOrBuilderList() { return channels_; } @@ -166,13 +166,13 @@ public int getChannelsCount() { /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getChannels(int index) { + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel getChannels(int index) { return channels_.get(index); } /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder getChannelsOrBuilder( + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder getChannelsOrBuilder( int index) { return channels_.get(index); } @@ -227,53 +227,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(byte[] data) + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseDelimitedFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -282,7 +282,7 @@ public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentCha public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels prototype) { + public static Builder newBuilder(org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -303,20 +303,20 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:paymentchannels.StoredServerPaymentChannels) - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelsOrBuilder { + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.class, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.Builder.class); + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels.class, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels.Builder.class); } - // Construct using org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.newBuilder() + // Construct using org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -352,23 +352,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; } - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() { - return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.getDefaultInstance(); + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() { + return org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels.getDefaultInstance(); } - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels build() { - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = buildPartial(); + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels build() { + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels buildPartial() { - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels(this); + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels buildPartial() { + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels result = new org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels(this); int from_bitField0_ = bitField0_; if (channelsBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -384,16 +384,16 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels b } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels) { - return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels)other); + if (other instanceof org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels) { + return mergeFrom((org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels other) { - if (other == org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels other) { + if (other == org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels.getDefaultInstance()) return this; if (channelsBuilder_ == null) { if (!other.channels_.isEmpty()) { if (channels_.isEmpty()) { @@ -438,11 +438,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parsedMessage = null; + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannels) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -453,22 +453,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List channels_ = + private java.util.List channels_ = java.util.Collections.emptyList(); private void ensureChannelsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - channels_ = new java.util.ArrayList(channels_); + channels_ = new java.util.ArrayList(channels_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder> channelsBuilder_; + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder> channelsBuilder_; /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public java.util.List getChannelsList() { + public java.util.List getChannelsList() { if (channelsBuilder_ == null) { return java.util.Collections.unmodifiableList(channels_); } else { @@ -488,7 +488,7 @@ public int getChannelsCount() { /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getChannels(int index) { + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel getChannels(int index) { if (channelsBuilder_ == null) { return channels_.get(index); } else { @@ -499,7 +499,7 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel ge * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ public Builder setChannels( - int index, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel value) { + int index, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel value) { if (channelsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -516,7 +516,7 @@ public Builder setChannels( * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ public Builder setChannels( - int index, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder builderForValue) { + int index, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder builderForValue) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); channels_.set(index, builderForValue.build()); @@ -529,7 +529,7 @@ public Builder setChannels( /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public Builder addChannels(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel value) { + public Builder addChannels(org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel value) { if (channelsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -546,7 +546,7 @@ public Builder addChannels(org.bitcoinj.protocols.channels.ServerState.StoredSer * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ public Builder addChannels( - int index, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel value) { + int index, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel value) { if (channelsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -563,7 +563,7 @@ public Builder addChannels( * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ public Builder addChannels( - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder builderForValue) { + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder builderForValue) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); channels_.add(builderForValue.build()); @@ -577,7 +577,7 @@ public Builder addChannels( * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ public Builder addChannels( - int index, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder builderForValue) { + int index, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder builderForValue) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); channels_.add(index, builderForValue.build()); @@ -591,7 +591,7 @@ public Builder addChannels( * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ public Builder addAllChannels( - java.lang.Iterable values) { + java.lang.Iterable values) { if (channelsBuilder_ == null) { ensureChannelsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -631,14 +631,14 @@ public Builder removeChannels(int index) { /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder getChannelsBuilder( + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder getChannelsBuilder( int index) { return getChannelsFieldBuilder().getBuilder(index); } /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder getChannelsOrBuilder( + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder getChannelsOrBuilder( int index) { if (channelsBuilder_ == null) { return channels_.get(index); } else { @@ -648,7 +648,7 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrB /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public java.util.List + public java.util.List getChannelsOrBuilderList() { if (channelsBuilder_ != null) { return channelsBuilder_.getMessageOrBuilderList(); @@ -659,31 +659,31 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrB /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder addChannelsBuilder() { + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder addChannelsBuilder() { return getChannelsFieldBuilder().addBuilder( - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance()); + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance()); } /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder addChannelsBuilder( + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder addChannelsBuilder( int index) { return getChannelsFieldBuilder().addBuilder( - index, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance()); + index, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance()); } /** * repeated .paymentchannels.StoredServerPaymentChannel channels = 1; */ - public java.util.List + public java.util.List getChannelsBuilderList() { return getChannelsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder> + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder> getChannelsFieldBuilder() { if (channelsBuilder_ == null) { channelsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder>( + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder>( channels_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -898,14 +898,14 @@ private StoredServerPaymentChannel( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.class, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder.class); + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.class, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1168,53 +1168,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(byte[] data) + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseDelimitedFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + public static org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1223,7 +1223,7 @@ public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentCha public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel prototype) { + public static Builder newBuilder(org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1244,20 +1244,20 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:paymentchannels.StoredServerPaymentChannel) - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder { + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.class, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder.class); + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.class, org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder.class); } - // Construct using org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.newBuilder() + // Construct using org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1302,23 +1302,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; + return org.pivxj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; } - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() { - return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance(); + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() { + return org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance(); } - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel build() { - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = buildPartial(); + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel build() { + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel buildPartial() { - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel(this); + public org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel buildPartial() { + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel result = new org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1359,16 +1359,16 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel bu } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel) { - return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel)other); + if (other instanceof org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel) { + return mergeFrom((org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel other) { - if (other == org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel other) { + if (other == org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance()) return this; if (other.hasBestValueToMe()) { setBestValueToMe(other.getBestValueToMe()); } @@ -1421,11 +1421,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parsedMessage = null; + org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.protocols.channels.ServerState.StoredServerPaymentChannel) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1762,7 +1762,7 @@ public Builder clearClientKey() { "nsactionUnlockTimeSecs\030\003 \002(\004\022\033\n\023contract" + "Transaction\030\004 \002(\014\022\024\n\014clientOutput\030\005 \001(\014\022" + "\r\n\005myKey\030\006 \002(\014\022\027\n\014majorVersion\030\007 \001(\r:\0011\022" + - "\021\n\tclientKey\030\010 \001(\014B.\n\037org.bitcoinj.proto", + "\021\n\tclientKey\030\010 \001(\014B.\n\037org.pivxj.proto", "cols.channelsB\013ServerState" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/Simple channels protocol.txt b/core/src/main/java/org/pivxj/protocols/channels/Simple channels protocol.txt similarity index 100% rename from core/src/main/java/org/bitcoinj/protocols/channels/Simple channels protocol.txt rename to core/src/main/java/org/pivxj/protocols/channels/Simple channels protocol.txt diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StateMachine.java b/core/src/main/java/org/pivxj/protocols/channels/StateMachine.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/channels/StateMachine.java rename to core/src/main/java/org/pivxj/protocols/channels/StateMachine.java index 26a062724..1d1f26932 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/StateMachine.java +++ b/core/src/main/java/org/pivxj/protocols/channels/StateMachine.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java b/core/src/main/java/org/pivxj/protocols/channels/StoredPaymentChannelClientStates.java similarity index 99% rename from core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java rename to core/src/main/java/org/pivxj/protocols/channels/StoredPaymentChannelClientStates.java index 8510a3c3b..9532dcb09 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java +++ b/core/src/main/java/org/pivxj/protocols/channels/StoredPaymentChannelClientStates.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.WalletExtension; +import org.pivxj.core.*; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.WalletExtension; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java b/core/src/main/java/org/pivxj/protocols/channels/StoredPaymentChannelServerStates.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java rename to core/src/main/java/org/pivxj/protocols/channels/StoredPaymentChannelServerStates.java index 72e4f34fa..dcc8e9d48 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java +++ b/core/src/main/java/org/pivxj/protocols/channels/StoredPaymentChannelServerStates.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; import com.google.common.collect.ImmutableMap; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.Wallet; -import org.bitcoinj.wallet.WalletExtension; +import org.pivxj.core.*; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.Wallet; +import org.pivxj.wallet.WalletExtension; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.SettableFuture; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StoredServerChannel.java b/core/src/main/java/org/pivxj/protocols/channels/StoredServerChannel.java similarity index 96% rename from core/src/main/java/org/bitcoinj/protocols/channels/StoredServerChannel.java rename to core/src/main/java/org/pivxj/protocols/channels/StoredServerChannel.java index b31d48e8c..4cbd1c3a2 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/StoredServerChannel.java +++ b/core/src/main/java/org/pivxj/protocols/channels/StoredServerChannel.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; -import org.bitcoinj.core.*; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.*; +import org.pivxj.wallet.Wallet; import javax.annotation.Nullable; import java.util.Date; @@ -88,7 +88,7 @@ synchronized void clearConnectedHandler() { } /** - * If a handler is connected, call its {@link org.bitcoinj.protocols.channels.PaymentChannelServer#close()} + * If a handler is connected, call its {@link org.pivxj.protocols.channels.PaymentChannelServer#close()} * method thus disconnecting the TCP connection. */ synchronized void closeConnectedHandler() { diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ValueOutOfRangeException.java b/core/src/main/java/org/pivxj/protocols/channels/ValueOutOfRangeException.java similarity index 95% rename from core/src/main/java/org/bitcoinj/protocols/channels/ValueOutOfRangeException.java rename to core/src/main/java/org/pivxj/protocols/channels/ValueOutOfRangeException.java index 0d747afb6..06075d1e6 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ValueOutOfRangeException.java +++ b/core/src/main/java/org/pivxj/protocols/channels/ValueOutOfRangeException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.protocols.channels; +package org.pivxj.protocols.channels; /** * Used when a given value is either too large too afford or too small for the network to accept. diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java b/core/src/main/java/org/pivxj/protocols/channels/package-info.java similarity index 94% rename from core/src/main/java/org/bitcoinj/protocols/channels/package-info.java rename to core/src/main/java/org/pivxj/protocols/channels/package-info.java index 458f16c40..f707d5f16 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java +++ b/core/src/main/java/org/pivxj/protocols/channels/package-info.java @@ -16,4 +16,4 @@ * Micropayment channels allow for rapid tiny payments to be made to a third party once a channel has been set up, using * some of the advanced features of the Bitcoin protocol. */ -package org.bitcoinj.protocols.channels; \ No newline at end of file +package org.pivxj.protocols.channels; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/protocols/package-info.java b/core/src/main/java/org/pivxj/protocols/package-info.java similarity index 96% rename from core/src/main/java/org/bitcoinj/protocols/package-info.java rename to core/src/main/java/org/pivxj/protocols/package-info.java index 3d1caf59a..d7d1c9ca3 100644 --- a/core/src/main/java/org/bitcoinj/protocols/package-info.java +++ b/core/src/main/java/org/pivxj/protocols/package-info.java @@ -16,4 +16,4 @@ * High level protocols that build on top of Bitcoin go here: we have the payment protocol for sending transactions * from sender to receiver with metadata, and a micropayment channels implementation. */ -package org.bitcoinj.protocols; \ No newline at end of file +package org.pivxj.protocols; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java b/core/src/main/java/org/pivxj/protocols/payments/PaymentProtocol.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java rename to core/src/main/java/org/pivxj/protocols/payments/PaymentProtocol.java index e74c114a4..22c3242f7 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java +++ b/core/src/main/java/org/pivxj/protocols/payments/PaymentProtocol.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.bitcoinj.protocols.payments; +package org.pivxj.protocols.payments; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.X509Utils; -import org.bitcoinj.script.ScriptBuilder; +import org.pivxj.core.*; +import org.pivxj.crypto.X509Utils; +import org.pivxj.script.ScriptBuilder; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; @@ -27,9 +27,6 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import org.bitcoin.protocols.payments.Protos; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.X509Utils; -import org.bitcoinj.script.ScriptBuilder; import javax.annotation.Nullable; import java.io.Serializable; diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocolException.java b/core/src/main/java/org/pivxj/protocols/payments/PaymentProtocolException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocolException.java rename to core/src/main/java/org/pivxj/protocols/payments/PaymentProtocolException.java index 63f34897a..a270fdbb1 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocolException.java +++ b/core/src/main/java/org/pivxj/protocols/payments/PaymentProtocolException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.protocols.payments; +package org.pivxj.protocols.payments; import java.security.cert.X509Certificate; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java b/core/src/main/java/org/pivxj/protocols/payments/PaymentSession.java similarity index 98% rename from core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java rename to core/src/main/java/org/pivxj/protocols/payments/PaymentSession.java index 7704030ee..1ed82e7a4 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java +++ b/core/src/main/java/org/pivxj/protocols/payments/PaymentSession.java @@ -12,15 +12,15 @@ * limitations under the License. */ -package org.bitcoinj.protocols.payments; - -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TrustStoreLoader; -import org.bitcoinj.params.MainNetParams; -import org.bitcoinj.protocols.payments.PaymentProtocol.PkiVerificationData; -import org.bitcoinj.uri.PivxURI; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.SendRequest; +package org.pivxj.protocols.payments; + +import org.pivxj.core.*; +import org.pivxj.crypto.TrustStoreLoader; +import org.pivxj.params.MainNetParams; +import org.pivxj.protocols.payments.PaymentProtocol.PkiVerificationData; +import org.pivxj.uri.PivxURI; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.SendRequest; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.ListenableFuture; diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java b/core/src/main/java/org/pivxj/protocols/payments/package-info.java similarity index 94% rename from core/src/main/java/org/bitcoinj/protocols/payments/package-info.java rename to core/src/main/java/org/pivxj/protocols/payments/package-info.java index 0d6de7187..35c0243c4 100644 --- a/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java +++ b/core/src/main/java/org/pivxj/protocols/payments/package-info.java @@ -16,4 +16,4 @@ * The BIP70 payment protocol wraps Bitcoin transactions and adds various useful features like memos, refund addresses * and authentication. */ -package org.bitcoinj.protocols.payments; \ No newline at end of file +package org.pivxj.protocols.payments; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/script/Script.java b/core/src/main/java/org/pivxj/script/Script.java similarity index 98% rename from core/src/main/java/org/bitcoinj/script/Script.java rename to core/src/main/java/org/pivxj/script/Script.java index bec143df9..c432e6e7c 100644 --- a/core/src/main/java/org/bitcoinj/script/Script.java +++ b/core/src/main/java/org/pivxj/script/Script.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.bitcoinj.script; +package org.pivxj.script; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.TransactionSignature; +import org.pivxj.core.*; +import org.pivxj.crypto.TransactionSignature; import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ import java.security.NoSuchAlgorithmException; import java.util.*; -import static org.bitcoinj.script.ScriptOpCodes.*; +import static org.pivxj.script.ScriptOpCodes.*; import static com.google.common.base.Preconditions.*; // TODO: Redesign this entire API to be more type safe and organised. @@ -675,7 +675,7 @@ public int getNumberOfBytesRequiredToSpend(@Nullable ECKey pubKey, @Nullable Scr * correctly are considered valid, but won't be mined upon, so they'll be rapidly re-orgd out of the chain. This * logic is defined by BIP 16.

* - *

bitcoinj does not support creation of P2SH transactions today. The goal of P2SH is to allow short addresses + *

pivxj does not support creation of P2SH transactions today. The goal of P2SH is to allow short addresses * even for complex scripts (eg, multi-sig outputs) so they are convenient to work with in things like QRcodes or * with copy/paste, and also to minimize the size of the unspent output set (which improves performance of the * Bitcoin system).

@@ -838,12 +838,12 @@ public boolean isUnspendable() { /** * Exposes the script interpreter. Normally you should not use this directly, instead use - * {@link org.bitcoinj.core.TransactionInput#verify(org.bitcoinj.core.TransactionOutput)} or - * {@link org.bitcoinj.script.Script#correctlySpends(org.bitcoinj.core.Transaction, long, Script)}. This method + * {@link org.pivxj.core.TransactionInput#verify(org.pivxj.core.TransactionOutput)} or + * {@link org.pivxj.script.Script#correctlySpends(org.pivxj.core.Transaction, long, Script)}. This method * is useful if you need more precise control or access to the final state of the stack. This interface is very * likely to change in future. * - * @deprecated Use {@link #executeScript(org.bitcoinj.core.Transaction, long, org.bitcoinj.script.Script, java.util.LinkedList, java.util.Set)} + * @deprecated Use {@link #executeScript(org.pivxj.core.Transaction, long, org.pivxj.script.Script, java.util.LinkedList, java.util.Set)} * instead. */ @Deprecated @@ -858,8 +858,8 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in /** * Exposes the script interpreter. Normally you should not use this directly, instead use - * {@link org.bitcoinj.core.TransactionInput#verify(org.bitcoinj.core.TransactionOutput)} or - * {@link org.bitcoinj.script.Script#correctlySpends(org.bitcoinj.core.Transaction, long, Script)}. This method + * {@link org.pivxj.core.TransactionInput#verify(org.pivxj.core.TransactionOutput)} or + * {@link org.pivxj.script.Script#correctlySpends(org.pivxj.core.Transaction, long, Script)}. This method * is useful if you need more precise control or access to the final state of the stack. This interface is very * likely to change in future. */ @@ -1564,7 +1564,7 @@ private static int executeMultiSig(Transaction txContainingThis, int index, Scri * Accessing txContainingThis from another thread while this method runs results in undefined behavior. * @param scriptSigIndex The index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey). * @param scriptPubKey The connected scriptPubKey containing the conditions needed to claim the value. - * @deprecated Use {@link #correctlySpends(org.bitcoinj.core.Transaction, long, org.bitcoinj.script.Script, java.util.Set)} + * @deprecated Use {@link #correctlySpends(org.pivxj.core.Transaction, long, org.pivxj.script.Script, java.util.Set)} * instead so that verification flags do not change as new verification options * are added. */ @@ -1648,7 +1648,7 @@ private byte[] getQuickProgram() { } /** - * Get the {@link org.bitcoinj.script.Script.ScriptType}. + * Get the {@link org.pivxj.script.Script.ScriptType}. * @return The script type. */ public ScriptType getScriptType() { diff --git a/core/src/main/java/org/bitcoinj/script/ScriptBuilder.java b/core/src/main/java/org/pivxj/script/ScriptBuilder.java similarity index 98% rename from core/src/main/java/org/bitcoinj/script/ScriptBuilder.java rename to core/src/main/java/org/pivxj/script/ScriptBuilder.java index c6bece728..9a46ff6f0 100644 --- a/core/src/main/java/org/bitcoinj/script/ScriptBuilder.java +++ b/core/src/main/java/org/pivxj/script/ScriptBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.bitcoinj.script; +package org.pivxj.script; import com.google.common.collect.Lists; -import org.bitcoinj.core.Address; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.Utils; -import org.bitcoinj.crypto.TransactionSignature; +import org.pivxj.core.Address; +import org.pivxj.core.ECKey; +import org.pivxj.core.Utils; +import org.pivxj.crypto.TransactionSignature; import javax.annotation.Nullable; import java.math.BigInteger; @@ -32,11 +32,11 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static org.bitcoinj.script.ScriptOpCodes.*; +import static org.pivxj.script.ScriptOpCodes.*; /** *

Tools for the construction of commonly used script types. You don't normally need this as it's hidden behind - * convenience methods on {@link org.bitcoinj.core.Transaction}, but they are useful when working with the + * convenience methods on {@link org.pivxj.core.Transaction}, but they are useful when working with the * protocol at a lower level.

*/ public class ScriptBuilder { diff --git a/core/src/main/java/org/bitcoinj/script/ScriptChunk.java b/core/src/main/java/org/pivxj/script/ScriptChunk.java similarity index 98% rename from core/src/main/java/org/bitcoinj/script/ScriptChunk.java rename to core/src/main/java/org/pivxj/script/ScriptChunk.java index 41079a48d..0f3111a5f 100644 --- a/core/src/main/java/org/bitcoinj/script/ScriptChunk.java +++ b/core/src/main/java/org/pivxj/script/ScriptChunk.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.bitcoinj.script; +package org.pivxj.script; -import org.bitcoinj.core.Utils; +import org.pivxj.core.Utils; import com.google.common.base.Objects; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ import java.util.Arrays; import static com.google.common.base.Preconditions.checkState; -import static org.bitcoinj.script.ScriptOpCodes.*; +import static org.pivxj.script.ScriptOpCodes.*; /** * A script element that is either a data push (signature, pubkey, etc) or a non-push (logic, numeric, etc) operation. diff --git a/core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java b/core/src/main/java/org/pivxj/script/ScriptOpCodes.java similarity index 99% rename from core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java rename to core/src/main/java/org/pivxj/script/ScriptOpCodes.java index 7a50eea00..1bf2a0ed0 100644 --- a/core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java +++ b/core/src/main/java/org/pivxj/script/ScriptOpCodes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.script; +package org.pivxj.script; import com.google.common.collect.ImmutableMap; @@ -22,7 +22,7 @@ /** * Various constants that define the assembly-like scripting language that forms part of the Bitcoin protocol. - * See {@link org.bitcoinj.script.Script} for details. Also provides a method to convert them to a string. + * See {@link org.pivxj.script.Script} for details. Also provides a method to convert them to a string. */ public class ScriptOpCodes { // push value diff --git a/core/src/main/java/org/bitcoinj/script/package-info.java b/core/src/main/java/org/pivxj/script/package-info.java similarity index 96% rename from core/src/main/java/org/bitcoinj/script/package-info.java rename to core/src/main/java/org/pivxj/script/package-info.java index 8198e99ce..f8db4292e 100644 --- a/core/src/main/java/org/bitcoinj/script/package-info.java +++ b/core/src/main/java/org/pivxj/script/package-info.java @@ -15,4 +15,4 @@ /** * Classes for working with and executing Bitcoin script programs, as embedded in inputs and outputs. */ -package org.bitcoinj.script; \ No newline at end of file +package org.pivxj.script; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java b/core/src/main/java/org/pivxj/signers/CustomTransactionSigner.java similarity index 92% rename from core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java rename to core/src/main/java/org/pivxj/signers/CustomTransactionSigner.java index 28f705c6c..7def98818 100644 --- a/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java +++ b/core/src/main/java/org/pivxj/signers/CustomTransactionSigner.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.bitcoinj.signers; - -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.ChildNumber; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.wallet.KeyBag; -import org.bitcoinj.wallet.RedeemData; +package org.pivxj.signers; + +import org.pivxj.core.*; +import org.pivxj.crypto.ChildNumber; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.wallet.KeyBag; +import org.pivxj.wallet.RedeemData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ /** *

This signer may be used as a template for creating custom multisig transaction signers.

*

- * Concrete implementations have to implement {@link #getSignature(org.bitcoinj.core.Sha256Hash, java.util.List)} + * Concrete implementations have to implement {@link #getSignature(org.pivxj.core.Sha256Hash, java.util.List)} * method returning a signature and a public key of the keypair used to created that signature. * It's up to custom implementation where to locate signatures: it may be a network connection, * some local API or something else. diff --git a/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java b/core/src/main/java/org/pivxj/signers/LocalTransactionSigner.java similarity index 90% rename from core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java rename to core/src/main/java/org/pivxj/signers/LocalTransactionSigner.java index ee02a31a6..03ef6eb8d 100644 --- a/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java +++ b/core/src/main/java/org/pivxj/signers/LocalTransactionSigner.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.bitcoinj.signers; +package org.pivxj.signers; import java.util.EnumSet; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.ScriptException; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionInput; -import org.bitcoinj.crypto.DeterministicKey; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.Script.VerifyFlag; -import org.bitcoinj.wallet.KeyBag; -import org.bitcoinj.wallet.RedeemData; +import org.pivxj.core.ECKey; +import org.pivxj.core.ScriptException; +import org.pivxj.core.Transaction; +import org.pivxj.core.TransactionInput; +import org.pivxj.crypto.DeterministicKey; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.script.Script.VerifyFlag; +import org.pivxj.wallet.KeyBag; +import org.pivxj.wallet.RedeemData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - *

{@link TransactionSigner} implementation for signing inputs using keys from provided {@link org.bitcoinj.wallet.KeyBag}.

+ *

{@link TransactionSigner} implementation for signing inputs using keys from provided {@link org.pivxj.wallet.KeyBag}.

*

This signer doesn't create input scripts for tx inputs. Instead it expects inputs to contain scripts with * empty sigs and replaces one of the empty sigs with calculated signature. *

@@ -40,7 +40,7 @@ * {@link ProposedTransaction} object that will be also passed then to the next signer in chain. This allows other * signers to use correct signing key for P2SH inputs, because all the keys involved in a single P2SH address have * the same derivation path.

- *

This signer always uses {@link org.bitcoinj.core.Transaction.SigHash#ALL} signing mode.

+ *

This signer always uses {@link org.pivxj.core.Transaction.SigHash#ALL} signing mode.

*/ public class LocalTransactionSigner extends StatelessTransactionSigner { private static final Logger log = LoggerFactory.getLogger(LocalTransactionSigner.class); diff --git a/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java b/core/src/main/java/org/pivxj/signers/MissingSigResolutionSigner.java similarity index 91% rename from core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java rename to core/src/main/java/org/pivxj/signers/MissingSigResolutionSigner.java index a4c7c5c17..6acf972e8 100644 --- a/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java +++ b/core/src/main/java/org/pivxj/signers/MissingSigResolutionSigner.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.bitcoinj.signers; +package org.pivxj.signers; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.TransactionInput; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptChunk; -import org.bitcoinj.wallet.KeyBag; -import org.bitcoinj.wallet.Wallet; +import org.pivxj.core.ECKey; +import org.pivxj.core.TransactionInput; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptChunk; +import org.pivxj.wallet.KeyBag; +import org.pivxj.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * This transaction signer resolves missing signatures in accordance with the given {@link org.bitcoinj.wallet.Wallet.MissingSigsMode}. + * This transaction signer resolves missing signatures in accordance with the given {@link org.pivxj.wallet.Wallet.MissingSigsMode}. * If missingSigsMode is USE_OP_ZERO this signer does nothing assuming missing signatures are already presented in * scriptSigs as OP_0. * In MissingSigsMode.THROW mode this signer will throw an exception. It would be MissingSignatureException diff --git a/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java b/core/src/main/java/org/pivxj/signers/StatelessTransactionSigner.java similarity index 96% rename from core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java rename to core/src/main/java/org/pivxj/signers/StatelessTransactionSigner.java index 393804bf0..2f89f9a8e 100644 --- a/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java +++ b/core/src/main/java/org/pivxj/signers/StatelessTransactionSigner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.signers; +package org.pivxj.signers; /** * A signer that doesn't have any state to be serialized. diff --git a/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java b/core/src/main/java/org/pivxj/signers/TransactionSigner.java similarity index 90% rename from core/src/main/java/org/bitcoinj/signers/TransactionSigner.java rename to core/src/main/java/org/pivxj/signers/TransactionSigner.java index e149bf10a..36d89cbdb 100644 --- a/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java +++ b/core/src/main/java/org/pivxj/signers/TransactionSigner.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.bitcoinj.signers; +package org.pivxj.signers; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.crypto.ChildNumber; -import org.bitcoinj.script.Script; -import org.bitcoinj.wallet.KeyBag; +import org.pivxj.core.Transaction; +import org.pivxj.crypto.ChildNumber; +import org.pivxj.script.Script; +import org.pivxj.wallet.KeyBag; import java.util.HashMap; import java.util.List; @@ -29,7 +29,7 @@ *

Implementations of this interface are intended to sign inputs of the given transaction. Given transaction may already * be partially signed or somehow altered by other signers.

*

To make use of the signer, you need to add it into the wallet by - * calling {@link org.bitcoinj.wallet.Wallet#addTransactionSigner(TransactionSigner)}. Signer will be serialized + * calling {@link org.pivxj.wallet.Wallet#addTransactionSigner(TransactionSigner)}. Signer will be serialized * along with the wallet data. In order for a wallet to recreate signer after deserialization, each signer * should have no-args constructor

*/ diff --git a/core/src/main/java/org/bitcoinj/signers/package-info.java b/core/src/main/java/org/pivxj/signers/package-info.java similarity index 90% rename from core/src/main/java/org/bitcoinj/signers/package-info.java rename to core/src/main/java/org/pivxj/signers/package-info.java index 86e35e2f3..5156cd9ec 100644 --- a/core/src/main/java/org/bitcoinj/signers/package-info.java +++ b/core/src/main/java/org/pivxj/signers/package-info.java @@ -14,7 +14,7 @@ /** * Transaction signers know how to calculate signatures over transactions in different contexts, for example, using - * local private keys or fetching them from remote servers. The {@link org.bitcoinj.wallet.Wallet} class uses these + * local private keys or fetching them from remote servers. The {@link org.pivxj.wallet.Wallet} class uses these * when sending money. */ -package org.bitcoinj.signers; \ No newline at end of file +package org.pivxj.signers; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/store/BlockStore.java b/core/src/main/java/org/pivxj/store/BlockStore.java similarity index 86% rename from core/src/main/java/org/bitcoinj/store/BlockStore.java rename to core/src/main/java/org/pivxj/store/BlockStore.java index 188ebb7b3..1c8b87690 100644 --- a/core/src/main/java/org/bitcoinj/store/BlockStore.java +++ b/core/src/main/java/org/pivxj/store/BlockStore.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.StoredBlock; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.Sha256Hash; +import org.pivxj.core.StoredBlock; /** * An implementor of BlockStore saves StoredBlock objects to disk. Different implementations store them in @@ -46,8 +46,8 @@ public interface BlockStore { /** * Returns the {@link StoredBlock} that represents the top of the chain of greatest total work. Note that this - * can be arbitrarily expensive, you probably should use {@link org.bitcoinj.core.BlockChain#getChainHead()} - * or perhaps {@link org.bitcoinj.core.BlockChain#getBestChainHeight()} which will run in constant time and + * can be arbitrarily expensive, you probably should use {@link org.pivxj.core.BlockChain#getChainHead()} + * or perhaps {@link org.pivxj.core.BlockChain#getBestChainHeight()} which will run in constant time and * not take any heavyweight locks. */ StoredBlock getChainHead() throws BlockStoreException; @@ -61,7 +61,7 @@ public interface BlockStore { void close() throws BlockStoreException; /** - * Get the {@link org.bitcoinj.core.NetworkParameters} of this store. + * Get the {@link org.pivxj.core.NetworkParameters} of this store. * @return The network params. */ NetworkParameters getParams(); diff --git a/core/src/main/java/org/bitcoinj/store/BlockStoreException.java b/core/src/main/java/org/pivxj/store/BlockStoreException.java similarity index 97% rename from core/src/main/java/org/bitcoinj/store/BlockStoreException.java rename to core/src/main/java/org/pivxj/store/BlockStoreException.java index dc28f2540..bd144e734 100644 --- a/core/src/main/java/org/bitcoinj/store/BlockStoreException.java +++ b/core/src/main/java/org/pivxj/store/BlockStoreException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; /** * Thrown when something goes wrong with storing a block. Examples: out of disk space. diff --git a/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java b/core/src/main/java/org/pivxj/store/ChainFileLockedException.java similarity index 96% rename from core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java rename to core/src/main/java/org/pivxj/store/ChainFileLockedException.java index 7d7cf0721..2bc206f61 100644 --- a/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java +++ b/core/src/main/java/org/pivxj/store/ChainFileLockedException.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; /** * Thrown by {@link SPVBlockStore} when the process cannot gain exclusive access to the chain file. diff --git a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java b/core/src/main/java/org/pivxj/store/DatabaseFullPrunedBlockStore.java similarity index 99% rename from core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java rename to core/src/main/java/org/pivxj/store/DatabaseFullPrunedBlockStore.java index 9e9f9e2ab..f1a4cc531 100644 --- a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java +++ b/core/src/main/java/org/pivxj/store/DatabaseFullPrunedBlockStore.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; import com.google.common.collect.Lists; -import org.bitcoinj.core.*; -import org.bitcoinj.script.Script; +import org.pivxj.core.*; +import org.pivxj.script.Script; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -506,7 +506,7 @@ private void checkCompatibility() throws SQLException, BlockStoreException { results.close(); } catch (SQLException ex) { throw new BlockStoreException("Database block store is not compatible with the current release. " + - "See bitcoinj release notes for further information: " + ex.getMessage()); + "See pivxj release notes for further information: " + ex.getMessage()); } finally { if (ps != null && !ps.isClosed()) { ps.close(); @@ -554,7 +554,7 @@ private void createTables() throws SQLException, BlockStoreException { } /** - * Create a new store for the given {@link org.bitcoinj.core.NetworkParameters}. + * Create a new store for the given {@link org.pivxj.core.NetworkParameters}. * @param params The network. * @throws BlockStoreException If the store couldn't be created. */ @@ -1119,10 +1119,10 @@ public void deleteStore() throws BlockStoreException { /** * Calculate the balance for a coinbase, to-address, or p2sh address. * - *

The balance {@link org.bitcoinj.store.DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns + *

The balance {@link org.pivxj.store.DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns * the balance (summed) as an number, then use calculateClientSide=false

* - *

The balance {@link org.bitcoinj.store.DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns + *

The balance {@link org.pivxj.store.DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns * the all the openoutputs as stored in the DB (binary), then use calculateClientSide=true

* * @param address The address to calculate the balance of diff --git a/core/src/main/java/org/bitcoinj/store/FlatDB.java b/core/src/main/java/org/pivxj/store/FlatDB.java similarity index 99% rename from core/src/main/java/org/bitcoinj/store/FlatDB.java rename to core/src/main/java/org/pivxj/store/FlatDB.java index bdd1c6c54..7bf9279e8 100644 --- a/core/src/main/java/org/bitcoinj/store/FlatDB.java +++ b/core/src/main/java/org/pivxj/store/FlatDB.java @@ -1,4 +1,4 @@ -package org.bitcoinj.store; +package org.pivxj.store; /** * Created by Hash Engineering on 6/21/2016. @@ -10,7 +10,7 @@ */ -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/store/FullPrunedBlockStore.java b/core/src/main/java/org/pivxj/store/FullPrunedBlockStore.java similarity index 95% rename from core/src/main/java/org/bitcoinj/store/FullPrunedBlockStore.java rename to core/src/main/java/org/pivxj/store/FullPrunedBlockStore.java index 5db38f804..4c559d3bf 100644 --- a/core/src/main/java/org/bitcoinj/store/FullPrunedBlockStore.java +++ b/core/src/main/java/org/pivxj/store/FullPrunedBlockStore.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; +import org.pivxj.core.*; /** @@ -72,17 +72,17 @@ public interface FullPrunedBlockStore extends BlockStore, UTXOProvider { StoredUndoableBlock getUndoBlock(Sha256Hash hash) throws BlockStoreException; /** - * Gets a {@link org.bitcoinj.core.UTXO} with the given hash and index, or null if none is found + * Gets a {@link org.pivxj.core.UTXO} with the given hash and index, or null if none is found */ UTXO getTransactionOutput(Sha256Hash hash, long index) throws BlockStoreException; /** - * Adds a {@link org.bitcoinj.core.UTXO} to the list of unspent TransactionOutputs + * Adds a {@link org.pivxj.core.UTXO} to the list of unspent TransactionOutputs */ void addUnspentTransactionOutput(UTXO out) throws BlockStoreException; /** - * Removes a {@link org.bitcoinj.core.UTXO} from the list of unspent TransactionOutputs + * Removes a {@link org.pivxj.core.UTXO} from the list of unspent TransactionOutputs * Note that the coinbase of the genesis block should NEVER be spendable and thus never in the list. * @throws BlockStoreException if there is an underlying storage issue, or out was not in the list. */ diff --git a/core/src/main/java/org/bitcoinj/store/H2FullPrunedBlockStore.java b/core/src/main/java/org/pivxj/store/H2FullPrunedBlockStore.java similarity index 99% rename from core/src/main/java/org/bitcoinj/store/H2FullPrunedBlockStore.java rename to core/src/main/java/org/pivxj/store/H2FullPrunedBlockStore.java index f5eda873a..07e6c4d01 100644 --- a/core/src/main/java/org/bitcoinj/store/H2FullPrunedBlockStore.java +++ b/core/src/main/java/org/pivxj/store/H2FullPrunedBlockStore.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.sql.*; import java.util.ArrayList; diff --git a/core/src/main/java/org/bitcoinj/store/HashStore.java b/core/src/main/java/org/pivxj/store/HashStore.java similarity index 93% rename from core/src/main/java/org/bitcoinj/store/HashStore.java rename to core/src/main/java/org/pivxj/store/HashStore.java index f03973fae..31eb42b8e 100644 --- a/core/src/main/java/org/bitcoinj/store/HashStore.java +++ b/core/src/main/java/org/pivxj/store/HashStore.java @@ -14,28 +14,19 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.Threading; +import org.pivxj.core.*; +import org.pivxj.utils.Threading; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.annotation.Nullable; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.nio.channels.FileLock; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.locks.ReentrantLock; -import static com.google.common.base.Preconditions.*; - // TODO: Lose the mmap in this class. There are too many platform bugs that require odd workarounds. /** diff --git a/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java b/core/src/main/java/org/pivxj/store/LevelDBBlockStore.java similarity index 99% rename from core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java rename to core/src/main/java/org/pivxj/store/LevelDBBlockStore.java index d6ca57a07..340af4d2e 100644 --- a/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java +++ b/core/src/main/java/org/pivxj/store/LevelDBBlockStore.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.fusesource.leveldbjni.*; import org.iq80.leveldb.*; diff --git a/core/src/main/java/org/bitcoinj/store/LevelDBFullPrunedBlockStore.java b/core/src/main/java/org/pivxj/store/LevelDBFullPrunedBlockStore.java similarity index 98% rename from core/src/main/java/org/bitcoinj/store/LevelDBFullPrunedBlockStore.java rename to core/src/main/java/org/pivxj/store/LevelDBFullPrunedBlockStore.java index 443c52a91..0d9849e7c 100644 --- a/core/src/main/java/org/bitcoinj/store/LevelDBFullPrunedBlockStore.java +++ b/core/src/main/java/org/pivxj/store/LevelDBFullPrunedBlockStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; import java.util.Arrays; import java.util.HashMap; @@ -28,19 +28,19 @@ import java.io.*; import java.nio.ByteBuffer; -import org.bitcoinj.core.Address; -import org.bitcoinj.core.AddressFormatException; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.ScriptException; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.StoredBlock; -import org.bitcoinj.core.StoredUndoableBlock; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionOutputChanges; -import org.bitcoinj.core.UTXO; -import org.bitcoinj.core.UTXOProviderException; -import org.bitcoinj.core.VerificationException; -import org.bitcoinj.script.Script; +import org.pivxj.core.Address; +import org.pivxj.core.AddressFormatException; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.ScriptException; +import org.pivxj.core.Sha256Hash; +import org.pivxj.core.StoredBlock; +import org.pivxj.core.StoredUndoableBlock; +import org.pivxj.core.Transaction; +import org.pivxj.core.TransactionOutputChanges; +import org.pivxj.core.UTXO; +import org.pivxj.core.UTXOProviderException; +import org.pivxj.core.VerificationException; +import org.pivxj.script.Script; import org.iq80.leveldb.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/store/MasternodeDB.java b/core/src/main/java/org/pivxj/store/MasternodeDB.java similarity index 99% rename from core/src/main/java/org/bitcoinj/store/MasternodeDB.java rename to core/src/main/java/org/pivxj/store/MasternodeDB.java index 9ec529667..cebabc2b2 100644 --- a/core/src/main/java/org/bitcoinj/store/MasternodeDB.java +++ b/core/src/main/java/org/pivxj/store/MasternodeDB.java @@ -1,4 +1,4 @@ -package org.bitcoinj.store; +package org.pivxj.store; /** * Created by Hash Engineering on 2/26/2016. @@ -7,7 +7,7 @@ /** Access to the MN database (mncache.dat) */ -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java b/core/src/main/java/org/pivxj/store/MemoryBlockStore.java similarity index 94% rename from core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java rename to core/src/main/java/org/pivxj/store/MemoryBlockStore.java index eb2be66ea..b1d7a5888 100644 --- a/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java +++ b/core/src/main/java/org/pivxj/store/MemoryBlockStore.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.util.LinkedHashMap; import java.util.Map; /** - * Keeps {@link org.bitcoinj.core.StoredBlock}s in memory. Used primarily for unit testing. + * Keeps {@link org.pivxj.core.StoredBlock}s in memory. Used primarily for unit testing. */ public class MemoryBlockStore implements BlockStore { private LinkedHashMap blockMap = new LinkedHashMap() { diff --git a/core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java b/core/src/main/java/org/pivxj/store/MemoryFullPrunedBlockStore.java similarity index 99% rename from core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java rename to core/src/main/java/org/pivxj/store/MemoryFullPrunedBlockStore.java index b07fe892f..38ee68aaa 100644 --- a/core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java +++ b/core/src/main/java/org/pivxj/store/MemoryFullPrunedBlockStore.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -229,7 +229,7 @@ public void removeByMultiKey(MultiKeyType key) { } /** - * Keeps {@link StoredBlock}s, {@link StoredUndoableBlock}s and {@link org.bitcoinj.core.UTXO}s in memory. + * Keeps {@link StoredBlock}s, {@link StoredUndoableBlock}s and {@link org.pivxj.core.UTXO}s in memory. * Used primarily for unit testing. */ public class MemoryFullPrunedBlockStore implements FullPrunedBlockStore { diff --git a/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java b/core/src/main/java/org/pivxj/store/MySQLFullPrunedBlockStore.java similarity index 97% rename from core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java rename to core/src/main/java/org/pivxj/store/MySQLFullPrunedBlockStore.java index 032442557..de30fc689 100644 --- a/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java +++ b/core/src/main/java/org/pivxj/store/MySQLFullPrunedBlockStore.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.NetworkParameters; +import org.pivxj.core.NetworkParameters; import java.util.ArrayList; import java.util.Collections; @@ -24,7 +24,7 @@ /** *

A full pruned block store using the MySQL database engine. As an added bonus an address index is calculated, - * so you can use {@link #calculateBalanceForAddress(org.bitcoinj.core.Address)} to quickly look up + * so you can use {@link #calculateBalanceForAddress(org.pivxj.core.Address)} to quickly look up * the quantity of bitcoins controlled by that address.

*/ public class MySQLFullPrunedBlockStore extends DatabaseFullPrunedBlockStore { diff --git a/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java b/core/src/main/java/org/pivxj/store/PostgresFullPrunedBlockStore.java similarity index 98% rename from core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java rename to core/src/main/java/org/pivxj/store/PostgresFullPrunedBlockStore.java index 1f649970c..c69f1487a 100644 --- a/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java +++ b/core/src/main/java/org/pivxj/store/PostgresFullPrunedBlockStore.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ /** *

A full pruned block store using the Postgres database engine. As an added bonus an address index is calculated, - * so you can use {@link #calculateBalanceForAddress(org.bitcoinj.core.Address)} to quickly look up + * so you can use {@link #calculateBalanceForAddress(org.pivxj.core.Address)} to quickly look up * the quantity of bitcoins controlled by that address.

*/ public class PostgresFullPrunedBlockStore extends DatabaseFullPrunedBlockStore { @@ -209,7 +209,7 @@ public void put(StoredBlock storedBlock, StoredUndoableBlock undoableBlock) thro findS.close(); // Postgres insert-or-updates are very complex (and finnicky). This level of transaction isolation - // seems to work for bitcoinj + // seems to work for pivxj PreparedStatement s = conn.get().prepareStatement(getUpdateUndoableBlocksSQL()); s.setBytes(3, hashBytes); diff --git a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java b/core/src/main/java/org/pivxj/store/SPVBlockStore.java similarity index 99% rename from core/src/main/java/org/bitcoinj/store/SPVBlockStore.java rename to core/src/main/java/org/pivxj/store/SPVBlockStore.java index e8b34c068..f311b67b4 100644 --- a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java +++ b/core/src/main/java/org/pivxj/store/SPVBlockStore.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; -import org.bitcoinj.core.*; -import org.bitcoinj.utils.*; +import org.pivxj.core.*; +import org.pivxj.utils.*; import org.slf4j.*; import javax.annotation.*; diff --git a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java b/core/src/main/java/org/pivxj/store/WindowsMMapHack.java similarity index 98% rename from core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java rename to core/src/main/java/org/pivxj/store/WindowsMMapHack.java index 035d4f21d..7b1758bc1 100644 --- a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java +++ b/core/src/main/java/org/pivxj/store/WindowsMMapHack.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.store; +package org.pivxj.store; import sun.misc.*; import sun.nio.ch.*; diff --git a/core/src/main/java/org/bitcoinj/store/package-info.java b/core/src/main/java/org/pivxj/store/package-info.java similarity index 97% rename from core/src/main/java/org/bitcoinj/store/package-info.java rename to core/src/main/java/org/pivxj/store/package-info.java index 929cf9161..7b27d0c2b 100644 --- a/core/src/main/java/org/bitcoinj/store/package-info.java +++ b/core/src/main/java/org/pivxj/store/package-info.java @@ -18,4 +18,4 @@ * can calculate a full indexed UTXO set (i.e. it can query address balances), a store that's backed by the embedded H2 * database, and a memory only store useful for unit tests. */ -package org.bitcoinj.store; \ No newline at end of file +package org.pivxj.store; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/uri/BitcoinURIParseException.java b/core/src/main/java/org/pivxj/uri/BitcoinURIParseException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/uri/BitcoinURIParseException.java rename to core/src/main/java/org/pivxj/uri/BitcoinURIParseException.java index ea50e89dd..b8b840ced 100644 --- a/core/src/main/java/org/bitcoinj/uri/BitcoinURIParseException.java +++ b/core/src/main/java/org/pivxj/uri/BitcoinURIParseException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.uri; +package org.pivxj.uri; /** *

Exception to provide the following to {@link PivxURI}:

diff --git a/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java b/core/src/main/java/org/pivxj/uri/OptionalFieldValidationException.java similarity index 97% rename from core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java rename to core/src/main/java/org/pivxj/uri/OptionalFieldValidationException.java index d10fac186..bf72cd04c 100644 --- a/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java +++ b/core/src/main/java/org/pivxj/uri/OptionalFieldValidationException.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.uri; +package org.pivxj.uri; /** *

Exception to provide the following to {@link PivxURI}:

diff --git a/core/src/main/java/org/bitcoinj/uri/PivxURI.java b/core/src/main/java/org/pivxj/uri/PivxURI.java similarity index 98% rename from core/src/main/java/org/bitcoinj/uri/PivxURI.java rename to core/src/main/java/org/pivxj/uri/PivxURI.java index ad7f18dc3..1945e629f 100644 --- a/core/src/main/java/org/bitcoinj/uri/PivxURI.java +++ b/core/src/main/java/org/pivxj/uri/PivxURI.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.uri; +package org.pivxj.uri; -import org.bitcoinj.core.*; -import org.bitcoinj.params.AbstractBitcoinNetParams; +import org.pivxj.core.*; +import org.pivxj.params.AbstractBitcoinNetParams; import javax.annotation.Nullable; import java.io.UnsupportedEncodingException; @@ -77,8 +77,8 @@ public class PivxURI { public static final String FIELD_INSTANTSEND = "is"; /** - * URI for Bitcoin network. Use {@link org.bitcoinj.params.AbstractBitcoinNetParams#BITCOIN_SCHEME} if you specifically - * need Bitcoin, or use {@link org.bitcoinj.core.NetworkParameters#getUriScheme} to get the scheme + * URI for Bitcoin network. Use {@link org.pivxj.params.AbstractBitcoinNetParams#BITCOIN_SCHEME} if you specifically + * need Bitcoin, or use {@link org.pivxj.core.NetworkParameters#getUriScheme} to get the scheme * from network parameters. */ @Deprecated diff --git a/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java b/core/src/main/java/org/pivxj/uri/RequiredFieldValidationException.java similarity index 98% rename from core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java rename to core/src/main/java/org/pivxj/uri/RequiredFieldValidationException.java index 2214aae24..fd7932d24 100644 --- a/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java +++ b/core/src/main/java/org/pivxj/uri/RequiredFieldValidationException.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.uri; +package org.pivxj.uri; /** *

Exception to provide the following to {@link PivxURI}:

diff --git a/core/src/main/java/org/bitcoinj/uri/package-info.java b/core/src/main/java/org/pivxj/uri/package-info.java similarity index 96% rename from core/src/main/java/org/bitcoinj/uri/package-info.java rename to core/src/main/java/org/pivxj/uri/package-info.java index b1fc1857f..8a0e43206 100644 --- a/core/src/main/java/org/bitcoinj/uri/package-info.java +++ b/core/src/main/java/org/pivxj/uri/package-info.java @@ -15,4 +15,4 @@ /** * Parsing and handling of bitcoin: textual URIs as found in qr codes and web links. */ -package org.bitcoinj.uri; \ No newline at end of file +package org.pivxj.uri; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java b/core/src/main/java/org/pivxj/utils/BaseTaggableObject.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java rename to core/src/main/java/org/pivxj/utils/BaseTaggableObject.java index 14f2814aa..a2e1ca3f9 100644 --- a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java +++ b/core/src/main/java/org/pivxj/utils/BaseTaggableObject.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; diff --git a/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java b/core/src/main/java/org/pivxj/utils/BlockFileLoader.java similarity index 97% rename from core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java rename to core/src/main/java/org/pivxj/utils/BlockFileLoader.java index 77869e796..ce5354c3e 100644 --- a/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java +++ b/core/src/main/java/org/pivxj/utils/BlockFileLoader.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; -import org.bitcoinj.core.Block; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.ProtocolException; -import org.bitcoinj.core.Utils; +import org.pivxj.core.Block; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.ProtocolException; +import org.pivxj.core.Utils; import java.io.File; import java.io.FileInputStream; diff --git a/core/src/main/java/org/bitcoinj/utils/BriefLogFormatter.java b/core/src/main/java/org/pivxj/utils/BriefLogFormatter.java similarity index 96% rename from core/src/main/java/org/bitcoinj/utils/BriefLogFormatter.java rename to core/src/main/java/org/pivxj/utils/BriefLogFormatter.java index 6b3170246..e32b9cae0 100644 --- a/core/src/main/java/org/bitcoinj/utils/BriefLogFormatter.java +++ b/core/src/main/java/org/pivxj/utils/BriefLogFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import java.io.PrintWriter; import java.io.StringWriter; @@ -51,7 +51,7 @@ public static void initVerbose() { public static void initWithSilentBitcoinJ() { init(); - Logger.getLogger("org.bitcoinj").setLevel(Level.SEVERE); + Logger.getLogger("org.pivxj").setLevel(Level.SEVERE); } @Override diff --git a/core/src/main/java/org/bitcoinj/utils/BtcAutoFormat.java b/core/src/main/java/org/pivxj/utils/BtcAutoFormat.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/BtcAutoFormat.java rename to core/src/main/java/org/pivxj/utils/BtcAutoFormat.java index 0ac08c207..d62daa4d8 100644 --- a/core/src/main/java/org/bitcoinj/utils/BtcAutoFormat.java +++ b/core/src/main/java/org/pivxj/utils/BtcAutoFormat.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; -import static org.bitcoinj.core.Coin.SMALLEST_UNIT_EXPONENT; +import static org.pivxj.core.Coin.SMALLEST_UNIT_EXPONENT; import com.google.common.collect.ImmutableList; import java.math.BigInteger; @@ -54,7 +54,7 @@ * @see java.text.NumberFormat * @see java.text.DecimalFormat * @see DecimalFormatSymbols - * @see org.bitcoinj.core.Coin + * @see org.pivxj.core.Coin */ public final class BtcAutoFormat extends BtcFormat { diff --git a/core/src/main/java/org/bitcoinj/utils/BtcFixedFormat.java b/core/src/main/java/org/pivxj/utils/BtcFixedFormat.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/BtcFixedFormat.java rename to core/src/main/java/org/pivxj/utils/BtcFixedFormat.java index 8e7a2a8d6..c0f56f6c3 100644 --- a/core/src/main/java/org/bitcoinj/utils/BtcFixedFormat.java +++ b/core/src/main/java/org/pivxj/utils/BtcFixedFormat.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; -import static org.bitcoinj.core.Coin.SMALLEST_UNIT_EXPONENT; +import static org.pivxj.core.Coin.SMALLEST_UNIT_EXPONENT; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.Objects; import java.math.BigInteger; @@ -42,7 +42,7 @@ * @see java.text.Format * @see java.text.NumberFormat * @see java.text.DecimalFormat - * @see org.bitcoinj.core.Coin + * @see org.pivxj.core.Coin */ public final class BtcFixedFormat extends BtcFormat { diff --git a/core/src/main/java/org/bitcoinj/utils/BtcFormat.java b/core/src/main/java/org/pivxj/utils/BtcFormat.java similarity index 99% rename from core/src/main/java/org/bitcoinj/utils/BtcFormat.java rename to core/src/main/java/org/pivxj/utils/BtcFormat.java index edcb9df3d..b91c6f33d 100644 --- a/core/src/main/java/org/bitcoinj/utils/BtcFormat.java +++ b/core/src/main/java/org/pivxj/utils/BtcFormat.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; -import org.bitcoinj.core.CoinDefinition; -import org.bitcoinj.utils.BtcAutoFormat.Style; -import static org.bitcoinj.utils.BtcAutoFormat.Style.*; +import org.pivxj.core.CoinDefinition; +import org.pivxj.utils.BtcAutoFormat.Style; +import static org.pivxj.utils.BtcAutoFormat.Style.*; -import org.bitcoinj.core.Coin; +import org.pivxj.core.Coin; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import static com.google.common.base.Preconditions.checkArgument; @@ -262,7 +262,7 @@ *

Formatting

* *

You format a Bitcoin monetary value by passing it to the {@link BtcFormat#format(Object)} - * method. This argument can be either a {@link org.bitcoinj.core.Coin}-type object or a + * method. This argument can be either a {@link org.pivxj.core.Coin}-type object or a * numerical object such as {@link java.lang.Long} or {@link java.math.BigDecimal}. * Integer-based types such as {@link java.math.BigInteger} are interpreted as representing a * number of satoshis, while a {@link java.math.BigDecimal} is interpreted as representing a @@ -465,7 +465,7 @@ * @see java.text.DecimalFormat * @see java.text.DecimalFormatSymbols * @see java.text.FieldPosition - * @see org.bitcoinj.core.Coin + * @see org.pivxj.core.Coin */ public abstract class BtcFormat extends Format { @@ -1302,7 +1302,7 @@ else if (qty instanceof Coin) /** * Parse a String representation of a Bitcoin monetary value. Returns a - * {@link org.bitcoinj.core.Coin} object that represents the parsed value. + * {@link org.pivxj.core.Coin} object that represents the parsed value. * @see java.text.NumberFormat */ @Override public final Object parseObject(String source, ParsePosition pos) { return parse(source, pos); } diff --git a/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java b/core/src/main/java/org/pivxj/utils/ContextPropagatingThreadFactory.java similarity index 94% rename from core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java rename to core/src/main/java/org/pivxj/utils/ContextPropagatingThreadFactory.java index ca0cb761f..6b1ba6496 100644 --- a/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java +++ b/core/src/main/java/org/pivxj/utils/ContextPropagatingThreadFactory.java @@ -12,16 +12,16 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import com.google.common.base.*; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.*; import java.util.concurrent.*; /** - * A {@link java.util.concurrent.ThreadFactory} that propagates a {@link org.bitcoinj.core.Context} from the creating + * A {@link java.util.concurrent.ThreadFactory} that propagates a {@link org.pivxj.core.Context} from the creating * thread into the new thread. This factory creates daemon threads. */ public class ContextPropagatingThreadFactory implements ThreadFactory { diff --git a/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java b/core/src/main/java/org/pivxj/utils/DaemonThreadFactory.java similarity index 97% rename from core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java rename to core/src/main/java/org/pivxj/utils/DaemonThreadFactory.java index 1f3d9d28e..a227b9e73 100644 --- a/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java +++ b/core/src/main/java/org/pivxj/utils/DaemonThreadFactory.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/utils/ExchangeRate.java b/core/src/main/java/org/pivxj/utils/ExchangeRate.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/ExchangeRate.java rename to core/src/main/java/org/pivxj/utils/ExchangeRate.java index 7ef780117..13bac3c05 100644 --- a/core/src/main/java/org/bitcoinj/utils/ExchangeRate.java +++ b/core/src/main/java/org/pivxj/utils/ExchangeRate.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import static com.google.common.base.Preconditions.checkArgument; import java.io.Serializable; import java.math.BigInteger; -import org.bitcoinj.core.Coin; +import org.pivxj.core.Coin; import com.google.common.base.Objects; diff --git a/core/src/main/java/org/bitcoinj/utils/ExponentialBackoff.java b/core/src/main/java/org/pivxj/utils/ExponentialBackoff.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/ExponentialBackoff.java rename to core/src/main/java/org/pivxj/utils/ExponentialBackoff.java index 35927c831..43231e71c 100644 --- a/core/src/main/java/org/bitcoinj/utils/ExponentialBackoff.java +++ b/core/src/main/java/org/pivxj/utils/ExponentialBackoff.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; -import org.bitcoinj.core.Utils; +import org.pivxj.core.Utils; import com.google.common.primitives.Longs; import static com.google.common.base.Preconditions.checkArgument; diff --git a/core/src/main/java/org/bitcoinj/utils/Fiat.java b/core/src/main/java/org/pivxj/utils/Fiat.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/Fiat.java rename to core/src/main/java/org/pivxj/utils/Fiat.java index c55ba727c..a1dac88ee 100644 --- a/core/src/main/java/org/bitcoinj/utils/Fiat.java +++ b/core/src/main/java/org/pivxj/utils/Fiat.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import static com.google.common.base.Preconditions.checkArgument; import java.io.Serializable; import java.math.BigDecimal; -import org.bitcoinj.core.Monetary; +import org.pivxj.core.Monetary; import com.google.common.base.Objects; import com.google.common.math.LongMath; import com.google.common.primitives.Longs; /** - * Represents a monetary fiat value. It was decided to not fold this into {@link org.bitcoinj.core.Coin} because of type + * Represents a monetary fiat value. It was decided to not fold this into {@link org.pivxj.core.Coin} because of type * safety. Fiat values always come with an attached currency code. * * This class is immutable. diff --git a/core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java b/core/src/main/java/org/pivxj/utils/ListenerRegistration.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java rename to core/src/main/java/org/pivxj/utils/ListenerRegistration.java index f98e26f65..b2d7df5cf 100644 --- a/core/src/main/java/org/bitcoinj/utils/ListenerRegistration.java +++ b/core/src/main/java/org/pivxj/utils/ListenerRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import java.util.List; import java.util.concurrent.Executor; diff --git a/core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java b/core/src/main/java/org/pivxj/utils/MonetaryFormat.java similarity index 98% rename from core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java rename to core/src/main/java/org/pivxj/utils/MonetaryFormat.java index 0e3b7ea2b..a0c1b48fc 100644 --- a/core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java +++ b/core/src/main/java/org/pivxj/utils/MonetaryFormat.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.Monetary; +import org.pivxj.core.Coin; +import org.pivxj.core.Monetary; import java.math.RoundingMode; import java.text.DecimalFormatSymbols; @@ -391,7 +391,7 @@ else if (positiveSign != 0) } /** - * Parse a human readable coin value to a {@link org.bitcoinj.core.Coin} instance. + * Parse a human readable coin value to a {@link org.pivxj.core.Coin} instance. * * @throws NumberFormatException * if the string cannot be parsed for some reason @@ -401,7 +401,7 @@ public Coin parse(String str) throws NumberFormatException { } /** - * Parse a human readable fiat value to a {@link org.bitcoinj.utils.Fiat} instance. + * Parse a human readable fiat value to a {@link org.pivxj.utils.Fiat} instance. * * @throws NumberFormatException * if the string cannot be parsed for some reason diff --git a/core/src/main/java/org/bitcoinj/utils/Pair.java b/core/src/main/java/org/pivxj/utils/Pair.java similarity index 95% rename from core/src/main/java/org/bitcoinj/utils/Pair.java rename to core/src/main/java/org/pivxj/utils/Pair.java index 5db511630..844882697 100644 --- a/core/src/main/java/org/bitcoinj/utils/Pair.java +++ b/core/src/main/java/org/pivxj/utils/Pair.java @@ -1,6 +1,4 @@ -package org.bitcoinj.utils; - -import java.util.Comparator; +package org.pivxj.utils; /** * Created by Eric on 2/24/2016. diff --git a/core/src/main/java/org/bitcoinj/utils/TaggableObject.java b/core/src/main/java/org/pivxj/utils/TaggableObject.java similarity index 96% rename from core/src/main/java/org/bitcoinj/utils/TaggableObject.java rename to core/src/main/java/org/pivxj/utils/TaggableObject.java index 60c74cde6..07f008e0e 100644 --- a/core/src/main/java/org/bitcoinj/utils/TaggableObject.java +++ b/core/src/main/java/org/pivxj/utils/TaggableObject.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import com.google.protobuf.ByteString; @@ -22,7 +22,7 @@ /** *

An object that can carry around and possibly serialize a map of strings to immutable byte arrays. Tagged objects * can have data stored on them that might be useful for an application developer. For example a wallet can store tags, - * and thus this would be a reasonable place to put any important data items that the bitcoinj API does not allow for: + * and thus this would be a reasonable place to put any important data items that the pivxj API does not allow for: * things like exchange rates at the time a transaction was made would currently fall into this category. Of course, * it helps interop and other developers if you introduce a real type safe API for a new feature instead of using this * so please consider that path, if you find yourself tempted to store tags!

diff --git a/core/src/main/java/org/bitcoinj/utils/Threading.java b/core/src/main/java/org/pivxj/utils/Threading.java similarity index 93% rename from core/src/main/java/org/bitcoinj/utils/Threading.java rename to core/src/main/java/org/pivxj/utils/Threading.java index c9a43d5ad..08a61a5ec 100644 --- a/core/src/main/java/org/bitcoinj/utils/Threading.java +++ b/core/src/main/java/org/pivxj/utils/Threading.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; -import org.bitcoinj.core.CoinDefinition; +import org.pivxj.core.CoinDefinition; import com.google.common.util.concurrent.CycleDetectingLockFactory; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.Uninterruptibles; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ /** * Various threading related utilities. Provides a wrapper around explicit lock creation that lets you control whether - * bitcoinj performs cycle detection or not. Cycle detection is useful to detect bugs but comes with a small cost. + * pivxj performs cycle detection or not. Cycle detection is useful to detect bugs but comes with a small cost. * Also provides a worker thread that is designed for event listeners to be dispatched on. */ public class Threading { @@ -46,7 +46,7 @@ public class Threading { /** * An executor with one thread that is intended for running event listeners on. This ensures all event listener code * runs without any locks being held. It's intended for the API user to run things on. Callbacks registered by - * bitcoinj internally shouldn't normally run here, although currently there are a few exceptions. + * pivxj internally shouldn't normally run here, although currently there are a few exceptions. */ public static Executor USER_THREAD; @@ -80,7 +80,7 @@ public static void waitForUserCode() { * any unhandled exceptions that are caught whilst the framework is processing network traffic or doing other * background tasks. The purpose of this is to allow you to report back unanticipated crashes from your users * to a central collection center for analysis and debugging. You should configure this before any - * bitcoinj library code is run, setting it after you started network traffic and other forms of processing + * pivxj library code is run, setting it after you started network traffic and other forms of processing * may result in the change not taking effect. */ @Nullable @@ -131,7 +131,7 @@ public void execute(Runnable command) { static { // Default policy goes here. If you want to change this, use one of the static methods before - // instantiating any bitcoinj objects. The policy change will take effect only on new objects + // instantiating any pivxj objects. The policy change will take effect only on new objects // from that point onwards. throwOnLockCycles(); diff --git a/core/src/main/java/org/bitcoinj/utils/VersionTally.java b/core/src/main/java/org/pivxj/utils/VersionTally.java similarity index 90% rename from core/src/main/java/org/bitcoinj/utils/VersionTally.java rename to core/src/main/java/org/pivxj/utils/VersionTally.java index 5e37bbc3f..32044b031 100644 --- a/core/src/main/java/org/bitcoinj/utils/VersionTally.java +++ b/core/src/main/java/org/pivxj/utils/VersionTally.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.bitcoinj.utils; +package org.pivxj.utils; import java.util.Stack; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.StoredBlock; -import org.bitcoinj.store.BlockStore; -import org.bitcoinj.store.BlockStoreException; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.StoredBlock; +import org.pivxj.store.BlockStore; +import org.pivxj.store.BlockStoreException; /** * Caching counter for the block versions within a moving window. This class * is NOT thread safe (as if two threads are trying to use it concurrently, * there's risk of getting versions out of sequence). * - * @see org.bitcoinj.core.NetworkParameters#getMajorityWindow() - * @see org.bitcoinj.core.NetworkParameters#getMajorityEnforceBlockUpgrade() - * @see org.bitcoinj.core.NetworkParameters#getMajorityRejectBlockOutdated() + * @see org.pivxj.core.NetworkParameters#getMajorityWindow() + * @see org.pivxj.core.NetworkParameters#getMajorityEnforceBlockUpgrade() + * @see org.pivxj.core.NetworkParameters#getMajorityRejectBlockOutdated() */ public class VersionTally { /** diff --git a/core/src/main/java/org/bitcoinj/utils/package-info.java b/core/src/main/java/org/pivxj/utils/package-info.java similarity index 83% rename from core/src/main/java/org/bitcoinj/utils/package-info.java rename to core/src/main/java/org/pivxj/utils/package-info.java index fe2cc0017..64e2a056c 100644 --- a/core/src/main/java/org/bitcoinj/utils/package-info.java +++ b/core/src/main/java/org/pivxj/utils/package-info.java @@ -14,6 +14,6 @@ /** * Formatting monetary amounts, representing exchange rates, a program for loading Bitcoin Core saved block files, - * a class to control how bitcoinj uses threads and misc other utility classes that don't fit anywhere else. + * a class to control how pivxj uses threads and misc other utility classes that don't fit anywhere else. */ -package org.bitcoinj.utils; \ No newline at end of file +package org.pivxj.utils; \ No newline at end of file diff --git a/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java b/core/src/main/java/org/pivxj/wallet/AllRandomKeysRotating.java similarity index 96% rename from core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java rename to core/src/main/java/org/pivxj/wallet/AllRandomKeysRotating.java index 5624ef835..135030c60 100644 --- a/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java +++ b/core/src/main/java/org/pivxj/wallet/AllRandomKeysRotating.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; /** * Indicates that an attempt was made to upgrade a random wallet to deterministic, but there were no non-rotating diff --git a/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java b/core/src/main/java/org/pivxj/wallet/AllowUnconfirmedCoinSelector.java similarity index 95% rename from core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java rename to core/src/main/java/org/pivxj/wallet/AllowUnconfirmedCoinSelector.java index 1d0528350..b0540a6af 100644 --- a/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java +++ b/core/src/main/java/org/pivxj/wallet/AllowUnconfirmedCoinSelector.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.Transaction; +import org.pivxj.core.Transaction; /** * This coin selector will select any transaction at all, regardless of where it came from or whether it was diff --git a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java b/core/src/main/java/org/pivxj/wallet/BasicKeyChain.java similarity index 97% rename from core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java rename to core/src/main/java/org/pivxj/wallet/BasicKeyChain.java index 04b0990f0..d327f89d6 100644 --- a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java +++ b/core/src/main/java/org/pivxj/wallet/BasicKeyChain.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.BloomFilter; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.crypto.*; -import org.bitcoinj.utils.ListenerRegistration; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.listeners.KeyChainEventListener; +import org.pivxj.core.BloomFilter; +import org.pivxj.core.ECKey; +import org.pivxj.crypto.*; +import org.pivxj.utils.ListenerRegistration; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.listeners.KeyChainEventListener; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -349,8 +349,8 @@ public static BasicKeyChain fromProtobufUnencrypted(List keys) throw /** * Returns a new BasicKeyChain that contains all basic, ORIGINAL type keys and also any encrypted keys extracted * from the list. Unrecognised key types are ignored. - * @throws org.bitcoinj.wallet.UnreadableWalletException.BadPassword if the password doesn't seem to match - * @throws org.bitcoinj.wallet.UnreadableWalletException if the data structures are corrupted/inconsistent + * @throws org.pivxj.wallet.UnreadableWalletException.BadPassword if the password doesn't seem to match + * @throws org.pivxj.wallet.UnreadableWalletException if the data structures are corrupted/inconsistent */ public static BasicKeyChain fromProtobufEncrypted(List keys, KeyCrypter crypter) throws UnreadableWalletException { BasicKeyChain chain = new BasicKeyChain(checkNotNull(crypter)); @@ -434,7 +434,7 @@ public void run() { /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Convenience wrapper around {@link #toEncrypted(org.bitcoinj.crypto.KeyCrypter, + * Convenience wrapper around {@link #toEncrypted(org.pivxj.crypto.KeyCrypter, * org.spongycastle.crypto.params.KeyParameter)} which uses the default Scrypt key derivation algorithm and * parameters, derives a key from the given password and returns the created key. */ @@ -449,7 +449,7 @@ public BasicKeyChain toEncrypted(CharSequence password) { /** * Encrypt the wallet using the KeyCrypter and the AES key. A good default KeyCrypter to use is - * {@link org.bitcoinj.crypto.KeyCrypterScrypt}. + * {@link org.pivxj.crypto.KeyCrypterScrypt}. * * @param keyCrypter The KeyCrypter that specifies how to encrypt/ decrypt a key * @param aesKey AES key to use (normally created using KeyCrypter#deriveKey and cached as it is time consuming diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java b/core/src/main/java/org/pivxj/wallet/CoinSelection.java similarity index 92% rename from core/src/main/java/org/bitcoinj/wallet/CoinSelection.java rename to core/src/main/java/org/pivxj/wallet/CoinSelection.java index 758402109..b1d655a2c 100644 --- a/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java +++ b/core/src/main/java/org/pivxj/wallet/CoinSelection.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.TransactionOutput; +import org.pivxj.core.Coin; +import org.pivxj.core.TransactionOutput; import java.util.Collection; diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java b/core/src/main/java/org/pivxj/wallet/CoinSelector.java similarity index 92% rename from core/src/main/java/org/bitcoinj/wallet/CoinSelector.java rename to core/src/main/java/org/pivxj/wallet/CoinSelector.java index e656416a2..24cb16701 100644 --- a/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java +++ b/core/src/main/java/org/pivxj/wallet/CoinSelector.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.TransactionOutput; +import org.pivxj.core.Coin; +import org.pivxj.core.TransactionOutput; import java.util.List; diff --git a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java b/core/src/main/java/org/pivxj/wallet/DecryptingKeyBag.java similarity index 95% rename from core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java rename to core/src/main/java/org/pivxj/wallet/DecryptingKeyBag.java index b9f1e46f7..093274f8b 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java +++ b/core/src/main/java/org/pivxj/wallet/DecryptingKeyBag.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.ECKey; +import org.pivxj.core.ECKey; import org.spongycastle.crypto.params.KeyParameter; import javax.annotation.Nullable; @@ -28,7 +28,7 @@ /** * A DecryptingKeyBag filters a pre-existing key bag, decrypting keys as they are requested using the provided - * AES key. If the keys are encrypted and no AES key provided, {@link org.bitcoinj.core.ECKey.KeyIsEncryptedException} + * AES key. If the keys are encrypted and no AES key provided, {@link org.pivxj.core.ECKey.KeyIsEncryptedException} * will be thrown. */ public class DecryptingKeyBag implements KeyBag { diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java b/core/src/main/java/org/pivxj/wallet/DefaultCoinSelector.java similarity index 95% rename from core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java rename to core/src/main/java/org/pivxj/wallet/DefaultCoinSelector.java index 09f5d9c5f..c7a944224 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java +++ b/core/src/main/java/org/pivxj/wallet/DefaultCoinSelector.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionConfidence; -import org.bitcoinj.core.TransactionOutput; +import org.pivxj.core.Coin; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.Transaction; +import org.pivxj.core.TransactionConfidence; +import org.pivxj.core.TransactionOutput; import com.google.common.annotations.VisibleForTesting; import java.math.BigInteger; diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java b/core/src/main/java/org/pivxj/wallet/DefaultKeyChainFactory.java similarity index 97% rename from core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java rename to core/src/main/java/org/pivxj/wallet/DefaultKeyChainFactory.java index 498438d15..e28dd33b8 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java +++ b/core/src/main/java/org/pivxj/wallet/DefaultKeyChainFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.crypto.*; +import org.pivxj.crypto.*; /** * Default factory for creating keychains while de-serializing. diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java b/core/src/main/java/org/pivxj/wallet/DefaultRiskAnalysis.java similarity index 94% rename from core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java rename to core/src/main/java/org/pivxj/wallet/DefaultRiskAnalysis.java index 80714ce90..46f2e4fc1 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java +++ b/core/src/main/java/org/pivxj/wallet/DefaultRiskAnalysis.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.bitcoinj.wallet; - -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.ECKey.ECDSASignature; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionConfidence; -import org.bitcoinj.core.TransactionInput; -import org.bitcoinj.core.TransactionOutput; -import org.bitcoinj.crypto.TransactionSignature; -import org.bitcoinj.script.ScriptChunk; +package org.pivxj.wallet; + +import org.pivxj.core.Coin; +import org.pivxj.core.ECKey; +import org.pivxj.core.ECKey.ECDSASignature; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.Transaction; +import org.pivxj.core.TransactionConfidence; +import org.pivxj.core.TransactionInput; +import org.pivxj.core.TransactionOutput; +import org.pivxj.crypto.TransactionSignature; +import org.pivxj.script.ScriptChunk; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -114,7 +114,7 @@ private Result analyzeIsFinal() { /** * The reason a transaction is considered non-standard, returned by - * {@link #isStandard(org.bitcoinj.core.Transaction)}. + * {@link #isStandard(org.pivxj.core.Transaction)}. */ public enum RuleViolation { NONE, diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java b/core/src/main/java/org/pivxj/wallet/DeterministicKeyChain.java similarity index 98% rename from core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java rename to core/src/main/java/org/pivxj/wallet/DeterministicKeyChain.java index fd5e75e53..1684d6a56 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java +++ b/core/src/main/java/org/pivxj/wallet/DeterministicKeyChain.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; import com.google.common.collect.Lists; -import org.bitcoinj.core.BloomFilter; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.Utils; -import org.bitcoinj.crypto.*; -import org.bitcoinj.script.Script; -import org.bitcoinj.utils.Threading; -import org.bitcoinj.wallet.listeners.KeyChainEventListener; +import org.pivxj.core.BloomFilter; +import org.pivxj.core.ECKey; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.Utils; +import org.pivxj.crypto.*; +import org.pivxj.script.Script; +import org.pivxj.utils.Threading; +import org.pivxj.wallet.listeners.KeyChainEventListener; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; @@ -50,10 +50,10 @@ /** *

A deterministic key chain is a {@link KeyChain} that uses the * BIP 32 standard, as implemented by - * {@link org.bitcoinj.crypto.DeterministicHierarchy}, to derive all the keys in the keychain from a master seed. + * {@link org.pivxj.crypto.DeterministicHierarchy}, to derive all the keys in the keychain from a master seed. * This type of wallet is extremely convenient and flexible. Although backing up full wallet files is always a good * idea, to recover money only the root seed needs to be preserved and that is a number small enough that it can be - * written down on paper or, when represented using a BIP 39 {@link org.bitcoinj.crypto.MnemonicCode}, + * written down on paper or, when represented using a BIP 39 {@link org.pivxj.crypto.MnemonicCode}, * dictated over the phone (possibly even memorized).

* *

Deterministic key chains have other advantages: parts of the key tree can be selectively revealed to allow @@ -63,14 +63,14 @@ * A watching wallet is not instantiated using the public part of the master key as you may imagine. Instead, you * need to take the account key (first child of the master key) and provide the public part of that to the watching * wallet instead. You can do this by calling {@link #getWatchingKey()} and then serializing it with - * {@link org.bitcoinj.crypto.DeterministicKey#serializePubB58(org.bitcoinj.core.NetworkParameters)}. The resulting "xpub..." string encodes + * {@link org.pivxj.crypto.DeterministicKey#serializePubB58(org.pivxj.core.NetworkParameters)}. The resulting "xpub..." string encodes * sufficient information about the account key to create a watching chain via - * {@link org.bitcoinj.crypto.DeterministicKey#deserializeB58(org.bitcoinj.crypto.DeterministicKey, String, org.bitcoinj.core.NetworkParameters)} + * {@link org.pivxj.crypto.DeterministicKey#deserializeB58(org.pivxj.crypto.DeterministicKey, String, org.pivxj.core.NetworkParameters)} * (with null as the first parameter) and then - * {@link DeterministicKeyChain#DeterministicKeyChain(org.bitcoinj.crypto.DeterministicKey,KeyChainType keyChaintype)}.

+ * {@link DeterministicKeyChain#DeterministicKeyChain(org.pivxj.crypto.DeterministicKey,KeyChainType keyChaintype)}.

* - *

This class builds on {@link org.bitcoinj.crypto.DeterministicHierarchy} and - * {@link org.bitcoinj.crypto.DeterministicKey} by adding support for serialization to and from protobufs, + *

This class builds on {@link org.pivxj.crypto.DeterministicHierarchy} and + * {@link org.pivxj.crypto.DeterministicKey} by adding support for serialization to and from protobufs, * and encryption of parts of the key tree. Internally it arranges itself as per the BIP 32 spec, with the seed being * used to derive a master key, which is then used to derive an account key, the account key is used to derive two * child keys called the internal and external parent keys (for change and handing out addresses respectively) @@ -570,7 +570,7 @@ public List getKeys(KeyPurpose purpose, int numberOfKeys) { ImmutableList path = HDUtils.append(parentKey.getPath(), new ChildNumber(index - numberOfKeys + i, false)); DeterministicKey k = hierarchy.get(path, false, false); // Just a last minute sanity check before we hand the key out to the app for usage. This isn't inspired - // by any real problem reports from bitcoinj users, but I've heard of cases via the grapevine of + // by any real problem reports from pivxj users, but I've heard of cases via the grapevine of // places that lost money due to bitflips causing addresses to not match keys. Of course in an // environment with flaky RAM there's no real way to always win: bitflips could be introduced at any // other layer. But as we're potentially retrieving from long term storage here, check anyway. @@ -698,7 +698,7 @@ public DeterministicKey getKeyByPath(List path, boolean create) { *

An alias for getKeyByPath(getAccountPath()).

* *

Use this when you would like to create a watching key chain that follows this one, but can't spend money from it. - * The returned key can be serialized and then passed into {@link #watch(org.bitcoinj.crypto.DeterministicKey)} + * The returned key can be serialized and then passed into {@link #watch(org.pivxj.crypto.DeterministicKey)} * on another system to watch the hierarchy.

* *

Note that the returned key is not pubkey only unless this key chain already is: the returned key can still @@ -1395,7 +1395,7 @@ public int getKeyLookaheadEpoch() { /** * Whether the keychain is married. A keychain is married when it vends P2SH addresses * from multiple keychains in a multisig relationship. - * @see org.bitcoinj.wallet.MarriedKeyChain + * @see org.pivxj.wallet.MarriedKeyChain */ public boolean isMarried() { return false; diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java b/core/src/main/java/org/pivxj/wallet/DeterministicSeed.java similarity index 96% rename from core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java rename to core/src/main/java/org/pivxj/wallet/DeterministicSeed.java index ea622a9a5..24a2af60d 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java +++ b/core/src/main/java/org/pivxj/wallet/DeterministicSeed.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.Utils; -import org.bitcoinj.crypto.*; +import org.pivxj.core.Utils; +import org.pivxj.crypto.*; import com.google.common.base.Charsets; import com.google.common.base.Objects; @@ -31,7 +31,7 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.bitcoinj.core.Utils.HEX; +import static org.pivxj.core.Utils.HEX; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; @@ -72,7 +72,7 @@ public DeterministicSeed(EncryptedData encryptedMnemonic, @Nullable EncryptedDat } /** - * Constructs a seed from a BIP 39 mnemonic code. See {@link org.bitcoinj.crypto.MnemonicCode} for more + * Constructs a seed from a BIP 39 mnemonic code. See {@link org.pivxj.crypto.MnemonicCode} for more * details on this scheme. * @param mnemonicCode A list of words. * @param seed The derived seed, or pass null to derive it from mnemonicCode (slow) @@ -84,7 +84,7 @@ public DeterministicSeed(List mnemonicCode, @Nullable byte[] seed, Strin } /** - * Constructs a seed from a BIP 39 mnemonic code. See {@link org.bitcoinj.crypto.MnemonicCode} for more + * Constructs a seed from a BIP 39 mnemonic code. See {@link org.pivxj.crypto.MnemonicCode} for more * details on this scheme. * @param random Entropy source * @param bits number of bits, must be divisible by 32 @@ -96,7 +96,7 @@ public DeterministicSeed(SecureRandom random, int bits, String passphrase, long } /** - * Constructs a seed from a BIP 39 mnemonic code. See {@link org.bitcoinj.crypto.MnemonicCode} for more + * Constructs a seed from a BIP 39 mnemonic code. See {@link org.pivxj.crypto.MnemonicCode} for more * details on this scheme. * @param entropy entropy bits, length must be divisible by 32 * @param passphrase A user supplied passphrase, or an empty string if there is no passphrase @@ -220,7 +220,7 @@ public int hashCode() { * Check if our mnemonic is a valid mnemonic phrase for our word list. * Does nothing if we are encrypted. * - * @throws org.bitcoinj.crypto.MnemonicException if check fails + * @throws org.pivxj.crypto.MnemonicException if check fails */ public void check() throws MnemonicException { if (mnemonicCode != null) diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java b/core/src/main/java/org/pivxj/wallet/DeterministicUpgradeRequiredException.java similarity index 96% rename from core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java rename to core/src/main/java/org/pivxj/wallet/DeterministicUpgradeRequiredException.java index dcd5e75e6..efb4a34a5 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java +++ b/core/src/main/java/org/pivxj/wallet/DeterministicUpgradeRequiredException.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; /** * Indicates that an attempt was made to use HD wallet features on a wallet that was deserialized from an old, diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java b/core/src/main/java/org/pivxj/wallet/DeterministicUpgradeRequiresPassword.java similarity index 97% rename from core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java rename to core/src/main/java/org/pivxj/wallet/DeterministicUpgradeRequiresPassword.java index 4210e6b83..db6cf2dc2 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java +++ b/core/src/main/java/org/pivxj/wallet/DeterministicUpgradeRequiresPassword.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; /** * Indicates that the pre-HD random wallet is encrypted, so you should try the upgrade again after getting the diff --git a/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java b/core/src/main/java/org/pivxj/wallet/EncryptableKeyChain.java similarity index 86% rename from core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java rename to core/src/main/java/org/pivxj/wallet/EncryptableKeyChain.java index 4ad8e1171..ddbf5a15f 100644 --- a/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java +++ b/core/src/main/java/org/pivxj/wallet/EncryptableKeyChain.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.crypto.KeyCrypter; -import org.bitcoinj.crypto.KeyCrypterException; +import org.pivxj.crypto.KeyCrypter; +import org.pivxj.crypto.KeyCrypterException; import org.spongycastle.crypto.params.KeyParameter; import javax.annotation.Nullable; @@ -28,8 +28,8 @@ public interface EncryptableKeyChain extends KeyChain { /** * Takes the given password, which should be strong, derives a key from it and then invokes - * {@link #toEncrypted(org.bitcoinj.crypto.KeyCrypter, org.spongycastle.crypto.params.KeyParameter)} with - * {@link org.bitcoinj.crypto.KeyCrypterScrypt} as the crypter. + * {@link #toEncrypted(org.pivxj.crypto.KeyCrypter, org.spongycastle.crypto.params.KeyParameter)} with + * {@link org.pivxj.crypto.KeyCrypterScrypt} as the crypter. * * @return The derived key, in case you wish to cache it for future use. */ @@ -50,7 +50,7 @@ public interface EncryptableKeyChain extends KeyChain { /** * Decrypt the key chain with the given AES key and whatever {@link KeyCrypter} is already set. Note that if you * just want to spend money from an encrypted wallet, don't decrypt the whole thing first. Instead, set the - * {@link org.bitcoinj.wallet.SendRequest#aesKey} field before asking the wallet to build the send. + * {@link org.pivxj.wallet.SendRequest#aesKey} field before asking the wallet to build the send. * * @param aesKey AES key to use (normally created using KeyCrypter#deriveKey and cached as it is time consuming to * create from a password) diff --git a/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java b/core/src/main/java/org/pivxj/wallet/FilteringCoinSelector.java similarity index 96% rename from core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java rename to core/src/main/java/org/pivxj/wallet/FilteringCoinSelector.java index fb142dbee..975ff8990 100644 --- a/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java +++ b/core/src/main/java/org/pivxj/wallet/FilteringCoinSelector.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.*; +import org.pivxj.core.*; import java.util.HashSet; import java.util.Iterator; diff --git a/core/src/main/java/org/bitcoinj/wallet/InstantXCoinSelector.java b/core/src/main/java/org/pivxj/wallet/InstantXCoinSelector.java similarity index 91% rename from core/src/main/java/org/bitcoinj/wallet/InstantXCoinSelector.java rename to core/src/main/java/org/pivxj/wallet/InstantXCoinSelector.java index aa3a7b21b..f4d37b2b6 100644 --- a/core/src/main/java/org/bitcoinj/wallet/InstantXCoinSelector.java +++ b/core/src/main/java/org/pivxj/wallet/InstantXCoinSelector.java @@ -1,8 +1,8 @@ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionConfidence; -import org.bitcoinj.params.RegTestParams; +import org.pivxj.core.Transaction; +import org.pivxj.core.TransactionConfidence; +import org.pivxj.params.RegTestParams; /** * Created by Eric on 1/15/2016. diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java b/core/src/main/java/org/pivxj/wallet/KeyBag.java similarity index 96% rename from core/src/main/java/org/bitcoinj/wallet/KeyBag.java rename to core/src/main/java/org/pivxj/wallet/KeyBag.java index 684f13308..19faac743 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java +++ b/core/src/main/java/org/pivxj/wallet/KeyBag.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.ECKey; +import org.pivxj.core.ECKey; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChain.java b/core/src/main/java/org/pivxj/wallet/KeyChain.java similarity index 91% rename from core/src/main/java/org/bitcoinj/wallet/KeyChain.java rename to core/src/main/java/org/pivxj/wallet/KeyChain.java index 3d2dcc60b..05e1f48fd 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChain.java +++ b/core/src/main/java/org/pivxj/wallet/KeyChain.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.BloomFilter; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.wallet.listeners.KeyChainEventListener; +import org.pivxj.core.BloomFilter; +import org.pivxj.core.ECKey; +import org.pivxj.wallet.listeners.KeyChainEventListener; import java.util.List; import java.util.concurrent.Executor; /** - *

A KeyChain is a class that stores a collection of keys for a {@link org.bitcoinj.wallet.Wallet}. Key chains + *

A KeyChain is a class that stores a collection of keys for a {@link org.pivxj.wallet.Wallet}. Key chains * are expected to be able to look up keys given a hash (i.e. address) or pubkey bytes, and provide keys on request * for a given purpose. They can inform event listeners about new keys being added.

* @@ -51,7 +51,7 @@ enum KeyPurpose { /** Obtains a key intended for the given purpose. The chain may create a new key, derive one, or re-use an old one. */ ECKey getKey(KeyPurpose purpose); - /** Returns a list of keys serialized to the bitcoinj protobuf format. */ + /** Returns a list of keys serialized to the pivxj protobuf format. */ List serializeToProtobuf(); /** Adds a listener for events that are run when keys are added, on the user thread. */ @@ -88,7 +88,7 @@ enum KeyPurpose { *

This is used to generate a {@link BloomFilter} which can be {@link BloomFilter#merge(BloomFilter)}d with * another. It could also be used if you have a specific target for the filter's size.

* - *

See the docs for {@link org.bitcoinj.core.BloomFilter#BloomFilter(int, double, long)} for a brief + *

See the docs for {@link org.pivxj.core.BloomFilter#BloomFilter(int, double, long)} for a brief * explanation of anonymity when using bloom filters, and for the meaning of these parameters.

*/ BloomFilter getFilter(int size, double falsePositiveRate, long tweak); diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java b/core/src/main/java/org/pivxj/wallet/KeyChainFactory.java similarity index 95% rename from core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java rename to core/src/main/java/org/pivxj/wallet/KeyChainFactory.java index 61cfe4f5a..31aa6ef1c 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java +++ b/core/src/main/java/org/pivxj/wallet/KeyChainFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.crypto.DeterministicKey; -import org.bitcoinj.crypto.KeyCrypter; +import org.pivxj.crypto.DeterministicKey; +import org.pivxj.crypto.KeyCrypter; /** * Factory interface for creation keychains while de-serializing a wallet. diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/pivxj/wallet/KeyChainGroup.java similarity index 98% rename from core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java rename to core/src/main/java/org/pivxj/wallet/KeyChainGroup.java index 8667611de..a02180d62 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java +++ b/core/src/main/java/org/pivxj/wallet/KeyChainGroup.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; import com.google.common.collect.*; import com.google.protobuf.*; -import org.bitcoinj.core.*; -import org.bitcoinj.crypto.*; -import org.bitcoinj.script.*; -import org.bitcoinj.utils.*; -import org.bitcoinj.wallet.listeners.KeyChainEventListener; +import org.pivxj.core.*; +import org.pivxj.crypto.*; +import org.pivxj.script.*; +import org.pivxj.utils.*; +import org.pivxj.wallet.listeners.KeyChainEventListener; import org.slf4j.*; import org.spongycastle.crypto.params.*; @@ -35,7 +35,7 @@ import static com.google.common.base.Preconditions.*; /** - *

A KeyChainGroup is used by the {@link org.bitcoinj.wallet.Wallet} and + *

A KeyChainGroup is used by the {@link org.pivxj.wallet.Wallet} and * manages: a {@link BasicKeyChain} object (which will normally be empty), and zero or more * {@link DeterministicKeyChain}s. A deterministic key chain will be created lazily/on demand * when a fresh or current key is requested, possibly being initialized from the private key bytes of the earliest non @@ -486,7 +486,7 @@ public boolean removeImportedKey(ECKey key) { /** * Whether the active keychain is married. A keychain is married when it vends P2SH addresses * from multiple keychains in a multisig relationship. - * @see org.bitcoinj.wallet.MarriedKeyChain + * @see org.pivxj.wallet.MarriedKeyChain */ public final boolean isMarried() { return !chains.isEmpty() && getActiveKeyChain().isMarried(); @@ -494,9 +494,9 @@ public final boolean isMarried() { /** * Encrypt the keys in the group using the KeyCrypter and the AES key. A good default KeyCrypter to use is - * {@link org.bitcoinj.crypto.KeyCrypterScrypt}. + * {@link org.pivxj.crypto.KeyCrypterScrypt}. * - * @throws org.bitcoinj.crypto.KeyCrypterException Thrown if the wallet encryption fails for some reason, + * @throws org.pivxj.crypto.KeyCrypterException Thrown if the wallet encryption fails for some reason, * leaving the group unchanged. * @throws DeterministicUpgradeRequiredException Thrown if there are random keys but no HD chain. */ @@ -521,9 +521,9 @@ public void encrypt(KeyCrypter keyCrypter, KeyParameter aesKey) { /** * Decrypt the keys in the group using the previously given key crypter and the AES key. A good default - * KeyCrypter to use is {@link org.bitcoinj.crypto.KeyCrypterScrypt}. + * KeyCrypter to use is {@link org.pivxj.crypto.KeyCrypterScrypt}. * - * @throws org.bitcoinj.crypto.KeyCrypterException Thrown if the wallet decryption fails for some reason, leaving the group unchanged. + * @throws org.pivxj.crypto.KeyCrypterException Thrown if the wallet decryption fails for some reason, leaving the group unchanged. */ public void decrypt(KeyParameter aesKey) { // This code must be exception safe. diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java b/core/src/main/java/org/pivxj/wallet/KeyTimeCoinSelector.java similarity index 94% rename from core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java rename to core/src/main/java/org/pivxj/wallet/KeyTimeCoinSelector.java index 210ec71b7..6bfefc536 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java +++ b/core/src/main/java/org/pivxj/wallet/KeyTimeCoinSelector.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; -import org.bitcoinj.core.*; -import org.bitcoinj.script.Script; +import org.pivxj.core.*; +import org.pivxj.script.Script; import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ public class KeyTimeCoinSelector implements CoinSelector { private static final Logger log = LoggerFactory.getLogger(KeyTimeCoinSelector.class); - /** A number of inputs chosen to avoid hitting {@link org.bitcoinj.core.Transaction#MAX_STANDARD_TX_SIZE} */ + /** A number of inputs chosen to avoid hitting {@link org.pivxj.core.Transaction#MAX_STANDARD_TX_SIZE} */ public static final int MAX_SIMULTANEOUS_INPUTS = 600; private final long unixTimeSeconds; diff --git a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java b/core/src/main/java/org/pivxj/wallet/MarriedKeyChain.java similarity index 97% rename from core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java rename to core/src/main/java/org/pivxj/wallet/MarriedKeyChain.java index 7ef525b8e..15523c3d6 100644 --- a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java +++ b/core/src/main/java/org/pivxj/wallet/MarriedKeyChain.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.bitcoinj.wallet; +package org.pivxj.wallet; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; -import org.bitcoinj.core.BloomFilter; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.NetworkParameters; -import org.bitcoinj.core.Utils; -import org.bitcoinj.crypto.DeterministicKey; -import org.bitcoinj.crypto.KeyCrypter; -import org.bitcoinj.script.Script; -import org.bitcoinj.script.ScriptBuilder; +import org.pivxj.core.BloomFilter; +import org.pivxj.core.ECKey; +import org.pivxj.core.NetworkParameters; +import org.pivxj.core.Utils; +import org.pivxj.crypto.DeterministicKey; +import org.pivxj.crypto.KeyCrypter; +import org.pivxj.script.Script; +import org.pivxj.script.ScriptBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/bitcoinj/wallet/Protos.java b/core/src/main/java/org/pivxj/wallet/Protos.java similarity index 87% rename from core/src/main/java/org/bitcoinj/wallet/Protos.java rename to core/src/main/java/org/pivxj/wallet/Protos.java index bc0d3f6a5..a9b34b726 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Protos.java +++ b/core/src/main/java/org/pivxj/wallet/Protos.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: wallet.proto -package org.bitcoinj.wallet; +package org.pivxj.wallet; public final class Protos { private Protos() {} @@ -121,14 +121,14 @@ private PeerAddress( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.PeerAddress.class, org.bitcoinj.wallet.Protos.PeerAddress.Builder.class); + org.pivxj.wallet.Protos.PeerAddress.class, org.pivxj.wallet.Protos.PeerAddress.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -266,53 +266,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + public static org.pivxj.wallet.Protos.PeerAddress parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + public static org.pivxj.wallet.Protos.PeerAddress parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(byte[] data) + public static org.pivxj.wallet.Protos.PeerAddress parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + public static org.pivxj.wallet.Protos.PeerAddress parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.PeerAddress parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + public static org.pivxj.wallet.Protos.PeerAddress parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.PeerAddress parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseDelimitedFrom( + public static org.pivxj.wallet.Protos.PeerAddress parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + public static org.pivxj.wallet.Protos.PeerAddress parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + public static org.pivxj.wallet.Protos.PeerAddress parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -321,7 +321,7 @@ public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.wallet.Protos.PeerAddress prototype) { + public static Builder newBuilder(org.pivxj.wallet.Protos.PeerAddress prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -337,20 +337,20 @@ protected Builder newBuilderForType( */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.bitcoinj.wallet.Protos.PeerAddressOrBuilder { + implements org.pivxj.wallet.Protos.PeerAddressOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.PeerAddress.class, org.bitcoinj.wallet.Protos.PeerAddress.Builder.class); + org.pivxj.wallet.Protos.PeerAddress.class, org.pivxj.wallet.Protos.PeerAddress.Builder.class); } - // Construct using org.bitcoinj.wallet.Protos.PeerAddress.newBuilder() + // Construct using org.pivxj.wallet.Protos.PeerAddress.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -385,23 +385,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; } - public org.bitcoinj.wallet.Protos.PeerAddress getDefaultInstanceForType() { - return org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance(); + public org.pivxj.wallet.Protos.PeerAddress getDefaultInstanceForType() { + return org.pivxj.wallet.Protos.PeerAddress.getDefaultInstance(); } - public org.bitcoinj.wallet.Protos.PeerAddress build() { - org.bitcoinj.wallet.Protos.PeerAddress result = buildPartial(); + public org.pivxj.wallet.Protos.PeerAddress build() { + org.pivxj.wallet.Protos.PeerAddress result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.wallet.Protos.PeerAddress buildPartial() { - org.bitcoinj.wallet.Protos.PeerAddress result = new org.bitcoinj.wallet.Protos.PeerAddress(this); + public org.pivxj.wallet.Protos.PeerAddress buildPartial() { + org.pivxj.wallet.Protos.PeerAddress result = new org.pivxj.wallet.Protos.PeerAddress(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -422,16 +422,16 @@ public org.bitcoinj.wallet.Protos.PeerAddress buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.wallet.Protos.PeerAddress) { - return mergeFrom((org.bitcoinj.wallet.Protos.PeerAddress)other); + if (other instanceof org.pivxj.wallet.Protos.PeerAddress) { + return mergeFrom((org.pivxj.wallet.Protos.PeerAddress)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.wallet.Protos.PeerAddress other) { - if (other == org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.wallet.Protos.PeerAddress other) { + if (other == org.pivxj.wallet.Protos.PeerAddress.getDefaultInstance()) return this; if (other.hasIpAddress()) { setIpAddress(other.getIpAddress()); } @@ -465,11 +465,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.wallet.Protos.PeerAddress parsedMessage = null; + org.pivxj.wallet.Protos.PeerAddress parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.wallet.Protos.PeerAddress) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.wallet.Protos.PeerAddress) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -707,14 +707,14 @@ private EncryptedData( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.EncryptedData.class, org.bitcoinj.wallet.Protos.EncryptedData.Builder.class); + org.pivxj.wallet.Protos.EncryptedData.class, org.pivxj.wallet.Protos.EncryptedData.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -840,53 +840,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + public static org.pivxj.wallet.Protos.EncryptedData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + public static org.pivxj.wallet.Protos.EncryptedData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(byte[] data) + public static org.pivxj.wallet.Protos.EncryptedData parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + public static org.pivxj.wallet.Protos.EncryptedData parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.EncryptedData parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + public static org.pivxj.wallet.Protos.EncryptedData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.EncryptedData parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseDelimitedFrom( + public static org.pivxj.wallet.Protos.EncryptedData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + public static org.pivxj.wallet.Protos.EncryptedData parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + public static org.pivxj.wallet.Protos.EncryptedData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -895,7 +895,7 @@ public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.wallet.Protos.EncryptedData prototype) { + public static Builder newBuilder(org.pivxj.wallet.Protos.EncryptedData prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -911,20 +911,20 @@ protected Builder newBuilderForType( */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder { + implements org.pivxj.wallet.Protos.EncryptedDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.EncryptedData.class, org.bitcoinj.wallet.Protos.EncryptedData.Builder.class); + org.pivxj.wallet.Protos.EncryptedData.class, org.pivxj.wallet.Protos.EncryptedData.Builder.class); } - // Construct using org.bitcoinj.wallet.Protos.EncryptedData.newBuilder() + // Construct using org.pivxj.wallet.Protos.EncryptedData.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -957,23 +957,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; } - public org.bitcoinj.wallet.Protos.EncryptedData getDefaultInstanceForType() { - return org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + public org.pivxj.wallet.Protos.EncryptedData getDefaultInstanceForType() { + return org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); } - public org.bitcoinj.wallet.Protos.EncryptedData build() { - org.bitcoinj.wallet.Protos.EncryptedData result = buildPartial(); + public org.pivxj.wallet.Protos.EncryptedData build() { + org.pivxj.wallet.Protos.EncryptedData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.wallet.Protos.EncryptedData buildPartial() { - org.bitcoinj.wallet.Protos.EncryptedData result = new org.bitcoinj.wallet.Protos.EncryptedData(this); + public org.pivxj.wallet.Protos.EncryptedData buildPartial() { + org.pivxj.wallet.Protos.EncryptedData result = new org.pivxj.wallet.Protos.EncryptedData(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -990,16 +990,16 @@ public org.bitcoinj.wallet.Protos.EncryptedData buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.wallet.Protos.EncryptedData) { - return mergeFrom((org.bitcoinj.wallet.Protos.EncryptedData)other); + if (other instanceof org.pivxj.wallet.Protos.EncryptedData) { + return mergeFrom((org.pivxj.wallet.Protos.EncryptedData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.wallet.Protos.EncryptedData other) { - if (other == org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.wallet.Protos.EncryptedData other) { + if (other == org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance()) return this; if (other.hasInitialisationVector()) { setInitialisationVector(other.getInitialisationVector()); } @@ -1026,11 +1026,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.wallet.Protos.EncryptedData parsedMessage = null; + org.pivxj.wallet.Protos.EncryptedData parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.wallet.Protos.EncryptedData) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.wallet.Protos.EncryptedData) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1409,14 +1409,14 @@ private DeterministicKey( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.DeterministicKey.class, org.bitcoinj.wallet.Protos.DeterministicKey.Builder.class); + org.pivxj.wallet.Protos.DeterministicKey.class, org.pivxj.wallet.Protos.DeterministicKey.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1697,53 +1697,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(byte[] data) + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.DeterministicKey parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseDelimitedFrom( + public static org.pivxj.wallet.Protos.DeterministicKey parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + public static org.pivxj.wallet.Protos.DeterministicKey parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1752,7 +1752,7 @@ public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.wallet.Protos.DeterministicKey prototype) { + public static Builder newBuilder(org.pivxj.wallet.Protos.DeterministicKey prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1773,20 +1773,20 @@ protected Builder newBuilderForType( */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder { + implements org.pivxj.wallet.Protos.DeterministicKeyOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.DeterministicKey.class, org.bitcoinj.wallet.Protos.DeterministicKey.Builder.class); + org.pivxj.wallet.Protos.DeterministicKey.class, org.pivxj.wallet.Protos.DeterministicKey.Builder.class); } - // Construct using org.bitcoinj.wallet.Protos.DeterministicKey.newBuilder() + // Construct using org.pivxj.wallet.Protos.DeterministicKey.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1827,23 +1827,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; } - public org.bitcoinj.wallet.Protos.DeterministicKey getDefaultInstanceForType() { - return org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance(); + public org.pivxj.wallet.Protos.DeterministicKey getDefaultInstanceForType() { + return org.pivxj.wallet.Protos.DeterministicKey.getDefaultInstance(); } - public org.bitcoinj.wallet.Protos.DeterministicKey build() { - org.bitcoinj.wallet.Protos.DeterministicKey result = buildPartial(); + public org.pivxj.wallet.Protos.DeterministicKey build() { + org.pivxj.wallet.Protos.DeterministicKey result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.wallet.Protos.DeterministicKey buildPartial() { - org.bitcoinj.wallet.Protos.DeterministicKey result = new org.bitcoinj.wallet.Protos.DeterministicKey(this); + public org.pivxj.wallet.Protos.DeterministicKey buildPartial() { + org.pivxj.wallet.Protos.DeterministicKey result = new org.pivxj.wallet.Protos.DeterministicKey(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1877,16 +1877,16 @@ public org.bitcoinj.wallet.Protos.DeterministicKey buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.wallet.Protos.DeterministicKey) { - return mergeFrom((org.bitcoinj.wallet.Protos.DeterministicKey)other); + if (other instanceof org.pivxj.wallet.Protos.DeterministicKey) { + return mergeFrom((org.pivxj.wallet.Protos.DeterministicKey)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.wallet.Protos.DeterministicKey other) { - if (other == org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.wallet.Protos.DeterministicKey other) { + if (other == org.pivxj.wallet.Protos.DeterministicKey.getDefaultInstance()) return this; if (other.hasChainCode()) { setChainCode(other.getChainCode()); } @@ -1928,11 +1928,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.wallet.Protos.DeterministicKey parsedMessage = null; + org.pivxj.wallet.Protos.DeterministicKey parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.wallet.Protos.DeterministicKey) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.wallet.Protos.DeterministicKey) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2338,7 +2338,7 @@ public interface KeyOrBuilder /** * required .wallet.Key.Type type = 1; */ - org.bitcoinj.wallet.Protos.Key.Type getType(); + org.pivxj.wallet.Protos.Key.Type getType(); // optional bytes secret_bytes = 2; /** @@ -2376,7 +2376,7 @@ public interface KeyOrBuilder * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData(); + org.pivxj.wallet.Protos.EncryptedData getEncryptedData(); /** * optional .wallet.EncryptedData encrypted_data = 6; * @@ -2384,7 +2384,7 @@ public interface KeyOrBuilder * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder(); + org.pivxj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder(); // optional bytes public_key = 3; /** @@ -2461,11 +2461,11 @@ public interface KeyOrBuilder /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - org.bitcoinj.wallet.Protos.DeterministicKey getDeterministicKey(); + org.pivxj.wallet.Protos.DeterministicKey getDeterministicKey(); /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder(); + org.pivxj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder(); // optional bytes deterministic_seed = 8; /** @@ -2503,7 +2503,7 @@ public interface KeyOrBuilder * Encrypted version of the seed * */ - org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed(); + org.pivxj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed(); /** * optional .wallet.EncryptedData encrypted_deterministic_seed = 9; * @@ -2511,7 +2511,7 @@ public interface KeyOrBuilder * Encrypted version of the seed * */ - org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder(); + org.pivxj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder(); } /** * Protobuf type {@code wallet.Key} @@ -2577,7 +2577,7 @@ private Key( } case 8: { int rawValue = input.readEnum(); - org.bitcoinj.wallet.Protos.Key.Type value = org.bitcoinj.wallet.Protos.Key.Type.valueOf(rawValue); + org.pivxj.wallet.Protos.Key.Type value = org.pivxj.wallet.Protos.Key.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -2607,11 +2607,11 @@ private Key( break; } case 50: { - org.bitcoinj.wallet.Protos.EncryptedData.Builder subBuilder = null; + org.pivxj.wallet.Protos.EncryptedData.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = encryptedData_.toBuilder(); } - encryptedData_ = input.readMessage(org.bitcoinj.wallet.Protos.EncryptedData.PARSER, extensionRegistry); + encryptedData_ = input.readMessage(org.pivxj.wallet.Protos.EncryptedData.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptedData_); encryptedData_ = subBuilder.buildPartial(); @@ -2620,11 +2620,11 @@ private Key( break; } case 58: { - org.bitcoinj.wallet.Protos.DeterministicKey.Builder subBuilder = null; + org.pivxj.wallet.Protos.DeterministicKey.Builder subBuilder = null; if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = deterministicKey_.toBuilder(); } - deterministicKey_ = input.readMessage(org.bitcoinj.wallet.Protos.DeterministicKey.PARSER, extensionRegistry); + deterministicKey_ = input.readMessage(org.pivxj.wallet.Protos.DeterministicKey.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(deterministicKey_); deterministicKey_ = subBuilder.buildPartial(); @@ -2638,11 +2638,11 @@ private Key( break; } case 74: { - org.bitcoinj.wallet.Protos.EncryptedData.Builder subBuilder = null; + org.pivxj.wallet.Protos.EncryptedData.Builder subBuilder = null; if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = encryptedDeterministicSeed_.toBuilder(); } - encryptedDeterministicSeed_ = input.readMessage(org.bitcoinj.wallet.Protos.EncryptedData.PARSER, extensionRegistry); + encryptedDeterministicSeed_ = input.readMessage(org.pivxj.wallet.Protos.EncryptedData.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptedDeterministicSeed_); encryptedDeterministicSeed_ = subBuilder.buildPartial(); @@ -2664,14 +2664,14 @@ private Key( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_Key_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.Key.class, org.bitcoinj.wallet.Protos.Key.Builder.class); + org.pivxj.wallet.Protos.Key.class, org.pivxj.wallet.Protos.Key.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2810,7 +2810,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.Key.getDescriptor().getEnumTypes().get(0); + return org.pivxj.wallet.Protos.Key.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -2838,7 +2838,7 @@ private Type(int index, int value) { private int bitField0_; // required .wallet.Key.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.bitcoinj.wallet.Protos.Key.Type type_; + private org.pivxj.wallet.Protos.Key.Type type_; /** * required .wallet.Key.Type type = 1; */ @@ -2848,7 +2848,7 @@ public boolean hasType() { /** * required .wallet.Key.Type type = 1; */ - public org.bitcoinj.wallet.Protos.Key.Type getType() { + public org.pivxj.wallet.Protos.Key.Type getType() { return type_; } @@ -2880,7 +2880,7 @@ public com.google.protobuf.ByteString getSecretBytes() { // optional .wallet.EncryptedData encrypted_data = 6; public static final int ENCRYPTED_DATA_FIELD_NUMBER = 6; - private org.bitcoinj.wallet.Protos.EncryptedData encryptedData_; + private org.pivxj.wallet.Protos.EncryptedData encryptedData_; /** * optional .wallet.EncryptedData encrypted_data = 6; * @@ -2898,7 +2898,7 @@ public boolean hasEncryptedData() { * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData() { + public org.pivxj.wallet.Protos.EncryptedData getEncryptedData() { return encryptedData_; } /** @@ -2908,7 +2908,7 @@ public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData() { * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder() { + public org.pivxj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder() { return encryptedData_; } @@ -3021,7 +3021,7 @@ public long getCreationTimestamp() { // optional .wallet.DeterministicKey deterministic_key = 7; public static final int DETERMINISTIC_KEY_FIELD_NUMBER = 7; - private org.bitcoinj.wallet.Protos.DeterministicKey deterministicKey_; + private org.pivxj.wallet.Protos.DeterministicKey deterministicKey_; /** * optional .wallet.DeterministicKey deterministic_key = 7; */ @@ -3031,13 +3031,13 @@ public boolean hasDeterministicKey() { /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - public org.bitcoinj.wallet.Protos.DeterministicKey getDeterministicKey() { + public org.pivxj.wallet.Protos.DeterministicKey getDeterministicKey() { return deterministicKey_; } /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - public org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder() { + public org.pivxj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder() { return deterministicKey_; } @@ -3069,7 +3069,7 @@ public com.google.protobuf.ByteString getDeterministicSeed() { // optional .wallet.EncryptedData encrypted_deterministic_seed = 9; public static final int ENCRYPTED_DETERMINISTIC_SEED_FIELD_NUMBER = 9; - private org.bitcoinj.wallet.Protos.EncryptedData encryptedDeterministicSeed_; + private org.pivxj.wallet.Protos.EncryptedData encryptedDeterministicSeed_; /** * optional .wallet.EncryptedData encrypted_deterministic_seed = 9; * @@ -3087,7 +3087,7 @@ public boolean hasEncryptedDeterministicSeed() { * Encrypted version of the seed * */ - public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() { + public org.pivxj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() { return encryptedDeterministicSeed_; } /** @@ -3097,20 +3097,20 @@ public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() * Encrypted version of the seed * */ - public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder() { + public org.pivxj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder() { return encryptedDeterministicSeed_; } private void initFields() { - type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL; + type_ = org.pivxj.wallet.Protos.Key.Type.ORIGINAL; secretBytes_ = com.google.protobuf.ByteString.EMPTY; - encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + encryptedData_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); publicKey_ = com.google.protobuf.ByteString.EMPTY; label_ = ""; creationTimestamp_ = 0L; - deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance(); + deterministicKey_ = org.pivxj.wallet.Protos.DeterministicKey.getDefaultInstance(); deterministicSeed_ = com.google.protobuf.ByteString.EMPTY; - encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + encryptedDeterministicSeed_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -3230,53 +3230,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.bitcoinj.wallet.Protos.Key parseFrom( + public static org.pivxj.wallet.Protos.Key parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.Key parseFrom( + public static org.pivxj.wallet.Protos.Key parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.Key parseFrom(byte[] data) + public static org.pivxj.wallet.Protos.Key parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.bitcoinj.wallet.Protos.Key parseFrom( + public static org.pivxj.wallet.Protos.Key parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.Key parseFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.Key parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.Key parseFrom( + public static org.pivxj.wallet.Protos.Key parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.Key parseDelimitedFrom(java.io.InputStream input) + public static org.pivxj.wallet.Protos.Key parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.bitcoinj.wallet.Protos.Key parseDelimitedFrom( + public static org.pivxj.wallet.Protos.Key parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.bitcoinj.wallet.Protos.Key parseFrom( + public static org.pivxj.wallet.Protos.Key parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.bitcoinj.wallet.Protos.Key parseFrom( + public static org.pivxj.wallet.Protos.Key parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3285,7 +3285,7 @@ public static org.bitcoinj.wallet.Protos.Key parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.bitcoinj.wallet.Protos.Key prototype) { + public static Builder newBuilder(org.pivxj.wallet.Protos.Key prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3312,20 +3312,20 @@ protected Builder newBuilderForType( */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.bitcoinj.wallet.Protos.KeyOrBuilder { + implements org.pivxj.wallet.Protos.KeyOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_Key_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.Key.class, org.bitcoinj.wallet.Protos.Key.Builder.class); + org.pivxj.wallet.Protos.Key.class, org.pivxj.wallet.Protos.Key.Builder.class); } - // Construct using org.bitcoinj.wallet.Protos.Key.newBuilder() + // Construct using org.pivxj.wallet.Protos.Key.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3348,12 +3348,12 @@ private static Builder create() { public Builder clear() { super.clear(); - type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL; + type_ = org.pivxj.wallet.Protos.Key.Type.ORIGINAL; bitField0_ = (bitField0_ & ~0x00000001); secretBytes_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); if (encryptedDataBuilder_ == null) { - encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + encryptedData_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); } else { encryptedDataBuilder_.clear(); } @@ -3365,7 +3365,7 @@ public Builder clear() { creationTimestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000020); if (deterministicKeyBuilder_ == null) { - deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance(); + deterministicKey_ = org.pivxj.wallet.Protos.DeterministicKey.getDefaultInstance(); } else { deterministicKeyBuilder_.clear(); } @@ -3373,7 +3373,7 @@ public Builder clear() { deterministicSeed_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000080); if (encryptedDeterministicSeedBuilder_ == null) { - encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + encryptedDeterministicSeed_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); } else { encryptedDeterministicSeedBuilder_.clear(); } @@ -3387,23 +3387,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_Key_descriptor; } - public org.bitcoinj.wallet.Protos.Key getDefaultInstanceForType() { - return org.bitcoinj.wallet.Protos.Key.getDefaultInstance(); + public org.pivxj.wallet.Protos.Key getDefaultInstanceForType() { + return org.pivxj.wallet.Protos.Key.getDefaultInstance(); } - public org.bitcoinj.wallet.Protos.Key build() { - org.bitcoinj.wallet.Protos.Key result = buildPartial(); + public org.pivxj.wallet.Protos.Key build() { + org.pivxj.wallet.Protos.Key result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.bitcoinj.wallet.Protos.Key buildPartial() { - org.bitcoinj.wallet.Protos.Key result = new org.bitcoinj.wallet.Protos.Key(this); + public org.pivxj.wallet.Protos.Key buildPartial() { + org.pivxj.wallet.Protos.Key result = new org.pivxj.wallet.Protos.Key(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3460,16 +3460,16 @@ public org.bitcoinj.wallet.Protos.Key buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.bitcoinj.wallet.Protos.Key) { - return mergeFrom((org.bitcoinj.wallet.Protos.Key)other); + if (other instanceof org.pivxj.wallet.Protos.Key) { + return mergeFrom((org.pivxj.wallet.Protos.Key)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.bitcoinj.wallet.Protos.Key other) { - if (other == org.bitcoinj.wallet.Protos.Key.getDefaultInstance()) return this; + public Builder mergeFrom(org.pivxj.wallet.Protos.Key other) { + if (other == org.pivxj.wallet.Protos.Key.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -3533,11 +3533,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.bitcoinj.wallet.Protos.Key parsedMessage = null; + org.pivxj.wallet.Protos.Key parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.bitcoinj.wallet.Protos.Key) e.getUnfinishedMessage(); + parsedMessage = (org.pivxj.wallet.Protos.Key) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3549,7 +3549,7 @@ public Builder mergeFrom( private int bitField0_; // required .wallet.Key.Type type = 1; - private org.bitcoinj.wallet.Protos.Key.Type type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL; + private org.pivxj.wallet.Protos.Key.Type type_ = org.pivxj.wallet.Protos.Key.Type.ORIGINAL; /** * required .wallet.Key.Type type = 1; */ @@ -3559,13 +3559,13 @@ public boolean hasType() { /** * required .wallet.Key.Type type = 1; */ - public org.bitcoinj.wallet.Protos.Key.Type getType() { + public org.pivxj.wallet.Protos.Key.Type getType() { return type_; } /** * required .wallet.Key.Type type = 1; */ - public Builder setType(org.bitcoinj.wallet.Protos.Key.Type value) { + public Builder setType(org.pivxj.wallet.Protos.Key.Type value) { if (value == null) { throw new NullPointerException(); } @@ -3579,7 +3579,7 @@ public Builder setType(org.bitcoinj.wallet.Protos.Key.Type value) { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL; + type_ = org.pivxj.wallet.Protos.Key.Type.ORIGINAL; onChanged(); return this; } @@ -3641,9 +3641,9 @@ public Builder clearSecretBytes() { } // optional .wallet.EncryptedData encrypted_data = 6; - private org.bitcoinj.wallet.Protos.EncryptedData encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + private org.pivxj.wallet.Protos.EncryptedData encryptedData_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> encryptedDataBuilder_; + org.pivxj.wallet.Protos.EncryptedData, org.pivxj.wallet.Protos.EncryptedData.Builder, org.pivxj.wallet.Protos.EncryptedDataOrBuilder> encryptedDataBuilder_; /** * optional .wallet.EncryptedData encrypted_data = 6; * @@ -3661,7 +3661,7 @@ public boolean hasEncryptedData() { * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData() { + public org.pivxj.wallet.Protos.EncryptedData getEncryptedData() { if (encryptedDataBuilder_ == null) { return encryptedData_; } else { @@ -3675,7 +3675,7 @@ public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData() { * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - public Builder setEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value) { + public Builder setEncryptedData(org.pivxj.wallet.Protos.EncryptedData value) { if (encryptedDataBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3696,7 +3696,7 @@ public Builder setEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value) * */ public Builder setEncryptedData( - org.bitcoinj.wallet.Protos.EncryptedData.Builder builderForValue) { + org.pivxj.wallet.Protos.EncryptedData.Builder builderForValue) { if (encryptedDataBuilder_ == null) { encryptedData_ = builderForValue.build(); onChanged(); @@ -3713,12 +3713,12 @@ public Builder setEncryptedData( * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - public Builder mergeEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value) { + public Builder mergeEncryptedData(org.pivxj.wallet.Protos.EncryptedData value) { if (encryptedDataBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - encryptedData_ != org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance()) { + encryptedData_ != org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance()) { encryptedData_ = - org.bitcoinj.wallet.Protos.EncryptedData.newBuilder(encryptedData_).mergeFrom(value).buildPartial(); + org.pivxj.wallet.Protos.EncryptedData.newBuilder(encryptedData_).mergeFrom(value).buildPartial(); } else { encryptedData_ = value; } @@ -3738,7 +3738,7 @@ public Builder mergeEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value */ public Builder clearEncryptedData() { if (encryptedDataBuilder_ == null) { - encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + encryptedData_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); onChanged(); } else { encryptedDataBuilder_.clear(); @@ -3753,7 +3753,7 @@ public Builder clearEncryptedData() { * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDataBuilder() { + public org.pivxj.wallet.Protos.EncryptedData.Builder getEncryptedDataBuilder() { bitField0_ |= 0x00000004; onChanged(); return getEncryptedDataFieldBuilder().getBuilder(); @@ -3765,7 +3765,7 @@ public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDataBuilder( * If the secret data is encrypted, then secret_bytes is missing and this field is set. * */ - public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder() { + public org.pivxj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder() { if (encryptedDataBuilder_ != null) { return encryptedDataBuilder_.getMessageOrBuilder(); } else { @@ -3780,11 +3780,11 @@ public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuild * */ private com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> + org.pivxj.wallet.Protos.EncryptedData, org.pivxj.wallet.Protos.EncryptedData.Builder, org.pivxj.wallet.Protos.EncryptedDataOrBuilder> getEncryptedDataFieldBuilder() { if (encryptedDataBuilder_ == null) { encryptedDataBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder>( + org.pivxj.wallet.Protos.EncryptedData, org.pivxj.wallet.Protos.EncryptedData.Builder, org.pivxj.wallet.Protos.EncryptedDataOrBuilder>( encryptedData_, getParentForChildren(), isClean()); @@ -4001,9 +4001,9 @@ public Builder clearCreationTimestamp() { } // optional .wallet.DeterministicKey deterministic_key = 7; - private org.bitcoinj.wallet.Protos.DeterministicKey deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance(); + private org.pivxj.wallet.Protos.DeterministicKey deterministicKey_ = org.pivxj.wallet.Protos.DeterministicKey.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.DeterministicKey, org.bitcoinj.wallet.Protos.DeterministicKey.Builder, org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder> deterministicKeyBuilder_; + org.pivxj.wallet.Protos.DeterministicKey, org.pivxj.wallet.Protos.DeterministicKey.Builder, org.pivxj.wallet.Protos.DeterministicKeyOrBuilder> deterministicKeyBuilder_; /** * optional .wallet.DeterministicKey deterministic_key = 7; */ @@ -4013,7 +4013,7 @@ public boolean hasDeterministicKey() { /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - public org.bitcoinj.wallet.Protos.DeterministicKey getDeterministicKey() { + public org.pivxj.wallet.Protos.DeterministicKey getDeterministicKey() { if (deterministicKeyBuilder_ == null) { return deterministicKey_; } else { @@ -4023,7 +4023,7 @@ public org.bitcoinj.wallet.Protos.DeterministicKey getDeterministicKey() { /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - public Builder setDeterministicKey(org.bitcoinj.wallet.Protos.DeterministicKey value) { + public Builder setDeterministicKey(org.pivxj.wallet.Protos.DeterministicKey value) { if (deterministicKeyBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4040,7 +4040,7 @@ public Builder setDeterministicKey(org.bitcoinj.wallet.Protos.DeterministicKey v * optional .wallet.DeterministicKey deterministic_key = 7; */ public Builder setDeterministicKey( - org.bitcoinj.wallet.Protos.DeterministicKey.Builder builderForValue) { + org.pivxj.wallet.Protos.DeterministicKey.Builder builderForValue) { if (deterministicKeyBuilder_ == null) { deterministicKey_ = builderForValue.build(); onChanged(); @@ -4053,12 +4053,12 @@ public Builder setDeterministicKey( /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - public Builder mergeDeterministicKey(org.bitcoinj.wallet.Protos.DeterministicKey value) { + public Builder mergeDeterministicKey(org.pivxj.wallet.Protos.DeterministicKey value) { if (deterministicKeyBuilder_ == null) { if (((bitField0_ & 0x00000040) == 0x00000040) && - deterministicKey_ != org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance()) { + deterministicKey_ != org.pivxj.wallet.Protos.DeterministicKey.getDefaultInstance()) { deterministicKey_ = - org.bitcoinj.wallet.Protos.DeterministicKey.newBuilder(deterministicKey_).mergeFrom(value).buildPartial(); + org.pivxj.wallet.Protos.DeterministicKey.newBuilder(deterministicKey_).mergeFrom(value).buildPartial(); } else { deterministicKey_ = value; } @@ -4074,7 +4074,7 @@ public Builder mergeDeterministicKey(org.bitcoinj.wallet.Protos.DeterministicKey */ public Builder clearDeterministicKey() { if (deterministicKeyBuilder_ == null) { - deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance(); + deterministicKey_ = org.pivxj.wallet.Protos.DeterministicKey.getDefaultInstance(); onChanged(); } else { deterministicKeyBuilder_.clear(); @@ -4085,7 +4085,7 @@ public Builder clearDeterministicKey() { /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - public org.bitcoinj.wallet.Protos.DeterministicKey.Builder getDeterministicKeyBuilder() { + public org.pivxj.wallet.Protos.DeterministicKey.Builder getDeterministicKeyBuilder() { bitField0_ |= 0x00000040; onChanged(); return getDeterministicKeyFieldBuilder().getBuilder(); @@ -4093,7 +4093,7 @@ public org.bitcoinj.wallet.Protos.DeterministicKey.Builder getDeterministicKeyBu /** * optional .wallet.DeterministicKey deterministic_key = 7; */ - public org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder() { + public org.pivxj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder() { if (deterministicKeyBuilder_ != null) { return deterministicKeyBuilder_.getMessageOrBuilder(); } else { @@ -4104,11 +4104,11 @@ public org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyO * optional .wallet.DeterministicKey deterministic_key = 7; */ private com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.DeterministicKey, org.bitcoinj.wallet.Protos.DeterministicKey.Builder, org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder> + org.pivxj.wallet.Protos.DeterministicKey, org.pivxj.wallet.Protos.DeterministicKey.Builder, org.pivxj.wallet.Protos.DeterministicKeyOrBuilder> getDeterministicKeyFieldBuilder() { if (deterministicKeyBuilder_ == null) { deterministicKeyBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.DeterministicKey, org.bitcoinj.wallet.Protos.DeterministicKey.Builder, org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder>( + org.pivxj.wallet.Protos.DeterministicKey, org.pivxj.wallet.Protos.DeterministicKey.Builder, org.pivxj.wallet.Protos.DeterministicKeyOrBuilder>( deterministicKey_, getParentForChildren(), isClean()); @@ -4174,9 +4174,9 @@ public Builder clearDeterministicSeed() { } // optional .wallet.EncryptedData encrypted_deterministic_seed = 9; - private org.bitcoinj.wallet.Protos.EncryptedData encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + private org.pivxj.wallet.Protos.EncryptedData encryptedDeterministicSeed_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> encryptedDeterministicSeedBuilder_; + org.pivxj.wallet.Protos.EncryptedData, org.pivxj.wallet.Protos.EncryptedData.Builder, org.pivxj.wallet.Protos.EncryptedDataOrBuilder> encryptedDeterministicSeedBuilder_; /** * optional .wallet.EncryptedData encrypted_deterministic_seed = 9; * @@ -4194,7 +4194,7 @@ public boolean hasEncryptedDeterministicSeed() { * Encrypted version of the seed * */ - public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() { + public org.pivxj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() { if (encryptedDeterministicSeedBuilder_ == null) { return encryptedDeterministicSeed_; } else { @@ -4208,7 +4208,7 @@ public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() * Encrypted version of the seed * */ - public Builder setEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.EncryptedData value) { + public Builder setEncryptedDeterministicSeed(org.pivxj.wallet.Protos.EncryptedData value) { if (encryptedDeterministicSeedBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4229,7 +4229,7 @@ public Builder setEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.Encrypte * */ public Builder setEncryptedDeterministicSeed( - org.bitcoinj.wallet.Protos.EncryptedData.Builder builderForValue) { + org.pivxj.wallet.Protos.EncryptedData.Builder builderForValue) { if (encryptedDeterministicSeedBuilder_ == null) { encryptedDeterministicSeed_ = builderForValue.build(); onChanged(); @@ -4246,12 +4246,12 @@ public Builder setEncryptedDeterministicSeed( * Encrypted version of the seed * */ - public Builder mergeEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.EncryptedData value) { + public Builder mergeEncryptedDeterministicSeed(org.pivxj.wallet.Protos.EncryptedData value) { if (encryptedDeterministicSeedBuilder_ == null) { if (((bitField0_ & 0x00000100) == 0x00000100) && - encryptedDeterministicSeed_ != org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance()) { + encryptedDeterministicSeed_ != org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance()) { encryptedDeterministicSeed_ = - org.bitcoinj.wallet.Protos.EncryptedData.newBuilder(encryptedDeterministicSeed_).mergeFrom(value).buildPartial(); + org.pivxj.wallet.Protos.EncryptedData.newBuilder(encryptedDeterministicSeed_).mergeFrom(value).buildPartial(); } else { encryptedDeterministicSeed_ = value; } @@ -4271,7 +4271,7 @@ public Builder mergeEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.Encryp */ public Builder clearEncryptedDeterministicSeed() { if (encryptedDeterministicSeedBuilder_ == null) { - encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); + encryptedDeterministicSeed_ = org.pivxj.wallet.Protos.EncryptedData.getDefaultInstance(); onChanged(); } else { encryptedDeterministicSeedBuilder_.clear(); @@ -4286,7 +4286,7 @@ public Builder clearEncryptedDeterministicSeed() { * Encrypted version of the seed * */ - public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDeterministicSeedBuilder() { + public org.pivxj.wallet.Protos.EncryptedData.Builder getEncryptedDeterministicSeedBuilder() { bitField0_ |= 0x00000100; onChanged(); return getEncryptedDeterministicSeedFieldBuilder().getBuilder(); @@ -4298,7 +4298,7 @@ public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDeterministi * Encrypted version of the seed * */ - public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder() { + public org.pivxj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder() { if (encryptedDeterministicSeedBuilder_ != null) { return encryptedDeterministicSeedBuilder_.getMessageOrBuilder(); } else { @@ -4313,11 +4313,11 @@ public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterminist * */ private com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> + org.pivxj.wallet.Protos.EncryptedData, org.pivxj.wallet.Protos.EncryptedData.Builder, org.pivxj.wallet.Protos.EncryptedDataOrBuilder> getEncryptedDeterministicSeedFieldBuilder() { if (encryptedDeterministicSeedBuilder_ == null) { encryptedDeterministicSeedBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder>( + org.pivxj.wallet.Protos.EncryptedData, org.pivxj.wallet.Protos.EncryptedData.Builder, org.pivxj.wallet.Protos.EncryptedDataOrBuilder>( encryptedDeterministicSeed_, getParentForChildren(), isClean()); @@ -4445,14 +4445,14 @@ private Script( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_descriptor; + return org.pivxj.wallet.Protos.internal_static_wallet_Script_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_fieldAccessorTable + return org.pivxj.wallet.Protos.internal_static_wallet_Script_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.bitcoinj.wallet.Protos.Script.class, org.bitcoinj.wallet.Protos.Script.Builder.class); + org.pivxj.wallet.Protos.Script.class, org.pivxj.wallet.Protos.Script.Builder.class); } public static com.google.protobuf.Parser