Fixes #68 Mirror golang namespace structure

CHANGELOG.md

@@ -18,4 +18,3 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Known issues
 
-- Pip tool for python3.4 is is not compatible with Debian's  openssl package, so, python3.4 is installed without pip.

Makefile

@@ -53,9 +53,11 @@ build-swig:
 			sed -i 's/#/%/g' $(LIBSWIG_DIR)/structs.i ;\
 		fi \
 	}
-	rm -f ./skycoin/skycoin.py
+	rm -f ./skycoin/libpy/skycoin.py
 	rm -f swig/pyskycoin_wrap.c
-	swig -python -Iswig/include -I$(INCLUDE_DIR) -outdir ./skycoin/ -o swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/skycoin.i
+	mkdir -p ./skycoin/libpy/
+	touch  ./skycoin/libpy/__init__.py
+	swig -python -Iswig/include -I$(INCLUDE_DIR) -outdir ./skycoin/libpy/ -o swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/skycoin.i
 
 develop:
 	$(PYTHON_BIN) setup.py develop

setup.py

@@ -62,9 +62,6 @@ def build_extension(self, ext):
             stdout, stderr = make_process.communicate()
             print("stdout:")
             sys.stderr.write(str(stdout))
-            if len(stderr) > 0:
-            	print("stderr:")
-            	sys.stderr.write(str(stderr))
             # After making the library build the c library's
             # python interface with the parent build_extension method
             super(skycoin_build_ext, self).build_extension(ext)
@@ -76,13 +73,13 @@ def build_extension(self, ext):
 library_file = path.join(lib_path, 'libskycoin.a')
 extra_link_args = []
 if platform.system() == "Darwin":
-	extra_link_args += ["-framework", "Foundation", "-framework", "Security"]
+    extra_link_args += ["-framework", "Foundation", "-framework", "Security"]
 extra_link_args.append(library_file)
 
 setup(
-	name='Pyskycoin',  # Required
-    version='0.24.4',  # Required
-	description='Skycoin Python Library',
+    name='Pyskycoin',  # Required
+    version='0.25.0',  # Required
+    description='Skycoin Python Library',
     long_description=long_description,
     url='https://github.com/simelo/pyskycoin',
     author='stdevEclipse',  # Optional

skycoin/__init__.py

@@ -1,2 +1,8 @@
-from .skycoin import *
-from .skyerror import *
+from .skyerror import *
+import cipher
+import base58
+import secp256k1go
+import encrypt
+import scrypt
+import secp256k1
+import coin

skycoin/base58.py

@@ -0,0 +1,8 @@
+# import skycoin
+from .libpy import *
+
+def String2Hex(cadena):
+    return skycoin.SKY_base58_String2Hex(cadena)
+
+def Hex2Base58(cadena):
+    return skycoin.SKY_base58_Hex2Base58(cadena)

skycoin/cipher.py

@@ -0,0 +1,146 @@
+from libpy import skycoin
+
+def PubKey():
+    return skycoin.cipher_PubKey()
+
+def SecKey():
+    return skycoin.cipher_SecKey()
+
+def Address():
+    return skycoin.cipher__Address()
+
+def AddressFromPubKey(public_key, addres):
+    return skycoin.SKY_cipher_AddressFromPubKey(public_key, addres)
+
+def NewPubKey(hex_str, public_key):
+    return skycoin.SKY_cipher_NewPubKey(hex_str, public_key)
+
+def NewSecKey(hex_str, secret_key):
+    return skycoin.SKY_cipher_NewSecKey(hex_str, secret_key)
+
+def PubKeyFromSecKey(secret_key, public_key):
+    return skycoin.SKY_cipher_PubKeyFromSecKey(secret_key, public_key)
+
+def GenerateKeyPair(public_key, secret_key):
+    return skycoin.SKY_cipher_GenerateKeyPair(public_key, secret_key)
+
+def TestSecKey(secret_key):
+    return skycoin.SKY_cipher_TestSecKey(secret_key)
+
+def SHA256():
+    return skycoin.cipher_SHA256()
+
+def SumSHA256(text, sha):
+    return skycoin.SKY_cipher_SumSHA256(text, sha)
+
+def TestSecKeyHash(secret_key, sha):
+    return skycoin.SKY_cipher_TestSecKeyHash(secret_key, sha)
+
+def AddressVerify(address, public_key):
+    return skycoin.SKY_cipher_Address_Verify(address, public_key)
+
+def DecodeBase58Address(cadena, address):
+    return skycoin.SKY_cipher_DecodeBase58Address(cadena, address)
+
+def AddressBytes(address):
+    return skycoin.SKY_cipher_Address_Bytes(address)
+
+def AddressString(address):
+    return skycoin.SKY_cipher_Address_String(address)
+
+def AddressFromBytes(byte, address):
+    return skycoin.SKY_cipher_AddressFromBytes(byte, address)
+
+def AddressBitcoinBytes(address):
+    return skycoin.SKY_cipher_Address_BitcoinBytes(address)
+
+def BitcoinAddressFromBytes(byte, address):
+    return skycoin.SKY_cipher_BitcoinAddressFromBytes(byte, address)
+
+def PubKeyHex(public_key):
+    return skycoin.SKY_cipher_PubKey_Hex(public_key)
+
+def BitcoinAddressFromPubkey(public_key):
+    return skycoin.SKY_cipher_BitcoinAddressFromPubkey(public_key)
+
+def SecKeyFromHex(cadena, secret_key):
+    return skycoin.SKY_cipher_SecKeyFromHex(cadena, secret_key)
+
+def BitcoinWalletImportFormatFromSeckey(secret_key):
+    return skycoin.SKY_cipher_BitcoinWalletImportFormatFromSeckey(secret_key)
+
+def SecKeyFromWalletImportFormat(wip_1, secret_key):
+    return skycoin.SKY_cipher_SecKeyFromWalletImportFormat(wip_1, secret_key)
+
+def SecKeyHex(secret_key):
+    return skycoin.SKY_cipher_SecKey_Hex(secret_key)
+
+def RandByte(rang):
+    return skycoin.SKY_cipher_RandByte(rang)
+
+def GenerateDeterministicKeyPair(data, public_key, secret_key):
+    return skycoin.SKY_cipher_GenerateDeterministicKeyPair(data, public_key, secret_key)
+
+def AddressNull(address):
+    return skycoin.SKY_cipher_Address_Null(address)
+
+def PubKeyVerify(public_key):
+    return skycoin.SKY_cipher_PubKey_Verify(public_key)
+
+def SecKeyVerify(secret_key):
+    return skycoin.SKY_cipher_SecKey_Verify(secret_key)
+
+def ECDH(public_key_2, secret_key_1):
+    return skycoin.SKY_cipher_ECDH(public_key_2, secret_key_1)
+
+def Sig():
+    return skycoin.cipher_Sig()
+
+def NewSig(data, sig):
+    return skycoin.SKY_cipher_NewSig(data, sig)
+
+def SignHash(sha_sum, secret_key_1, sig_1):
+    return skycoin.SKY_cipher_SignHash(sha_sum, secret_key_1, sig_1)
+
+def ChkSig(addres, sha_sum, sig_1):
+    return skycoin.SKY_cipher_ChkSig(addres, sha_sum, sig_1)
+
+def PubKeyFromSig(sig_1, sha_sum, public_key_2):
+    return skycoin.SKY_cipher_PubKeyFromSig(sig_1, sha_sum, public_key_2)
+
+def VerifySignature(public_key, sig_1, sha_sum_1):
+    return skycoin.SKY_cipher_VerifySignature(public_key, sig_1, sha_sum_1)
+
+def GenerateDeterministicKeyPairsSeed(seed, num):
+    return skycoin.SKY_cipher_GenerateDeterministicKeyPairsSeed(seed, num)
+
+def Ripemd160():
+    return skycoin.cipher_Ripemd160()
+
+def HashRipemd160(p0, p1):
+    return skycoin.SKY_cipher_HashRipemd160(p0, p1)
+
+def Ripemd160Set(h, b):
+    return skycoin.SKY_cipher_Ripemd160_Set(h, b)
+
+def SHA256Set(h, b):
+    return skycoin.SKY_cipher_SHA256_Set(h, b)
+
+def SHA256Hex(h):
+    return skycoin.SKY_cipher_SHA256_Hex(h)
+
+def SHA256FromHex(p0, p1):
+    return skycoin.SKY_cipher_SHA256FromHex(p0, p1)
+
+def DoubleSHA256(b, h):
+    return skycoin.SKY_cipher_DoubleSHA256(b, h)
+
+def AddSHA256(p0, p1, p2):
+    return skycoin.SKY_cipher_AddSHA256(p0, p1, p2)
+
+def SHA256Xor(p0, p1, p2):
+    return skycoin.SKY_cipher_SHA256_Xor(p0, p1, p2)
+
+def SHA256Null(p0):
+    return skycoin.SKY_cipher_SHA256_Null(p0)
+

skycoin/coin.py

@@ -0,0 +1,142 @@
+from .libpy import *
+
+def CreateTransactions():
+    return skycoin.SKY_coin_Create_Transactions()
+
+def TransactionsAdd(txns, txn):
+    return skycoin.SKY_coin_Transactions_Add(txns, txn)
+
+def NewEmptyBlock(transactions):
+    return skycoin.SKY_coin_NewEmptyBlock(transactions)
+
+def GetBlockObject(block):
+    return skycoin.SKY_coin_GetBlockObject(block)
+
+def GetBlockBody(block):
+    return skycoin.SKY_coin_GetBlockBody(block)
+
+def BlockBodyHash(body, bodyhash):
+    return skycoin.SKY_coin_BlockBody_Hash(body, bodyhash)
+
+def NewBlock( p0, p1, p2, p3, p4):
+    return skycoin.SKY_coin_NewBlock( p0, p1, p2, p3, p4)
+
+def BlockHashHeader(block, hash1):
+    return skycoin.SKY_coin_Block_HashHeader(block, hash1)
+
+def BlockHeaderHash(Head, hash2):
+    return skycoin.SKY_coin_BlockHeader_Hash(Head, hash2)
+
+def BlockHashBody(block, hash1):
+    return skycoin.SKY_coin_Block_HashBody(block, hash1)
+
+def NewGenesisBlock(address, genCoins, genTime):
+    return skycoin.SKY_coin_NewGenesisBlock(address, genCoins, genTime)
+
+def BlockHeaderBytes(head):
+    return skycoin.SKY_coin_BlockHeader_Bytes(head)
+
+def TransactionPushOutput(handle, address, p0, p1):
+    return skycoin.SKY_coin_Transaction_PushOutput(handle, address, p0, p1)
+
+def UxOut():
+    return skycoin.coin__UxOut()
+
+def BlockHeader():
+    return skycoin.coin__BlockHeader()
+
+def CreateUnspent(bh, handle, index, ux):
+    return skycoin.SKY_coin_CreateUnspent(bh, handle, index, ux)
+
+def CreateUnspents(bh, txn):
+    return skycoin.SKY_coin_CreateUnspents(bh, txn)
+
+def TransactionsGetAt(handle, p1):
+    return skycoin.SKY_coin_Transactions_GetAt(handle, p1)
+
+def GetTransactionObject(tx1):
+    return skycoin.SKY_coin_GetTransactionObject(tx1)
+
+def CreateTransaction():
+    return skycoin.SKY_coin_Create_Transaction()
+
+def UxOutHash(ux, h):
+    return skycoin.SKY_coin_UxOut_Hash(ux, h)
+
+def TransactionPushInput(handle, h):
+    return skycoin.SKY_coin_Transaction_PushInput(handle, h)
+
+def TransactionSignInputs(handle, secKeys):
+    return skycoin.SKY_coin_Transaction_SignInputs(handle, secKeys)
+
+def TransactionUpdateHeader(handle):
+    return skycoin.SKY_coin_Transaction_UpdateHeader(handle)
+
+def UxBody():
+    return skycoin.coin__UxBody()
+
+def UxHead():
+    return skycoin.coin__UxHead()
+
+def Transaction():
+    return skycoin.coin__Transaction()
+
+def TransactionsLength(handle):
+    return skycoin.SKY_coin_Transactions_Length(handle)
+
+def TransactionCopy(handle):
+    return skycoin.SKY_coin_Transaction_Copy(handle)
+
+def TransactionVerify(handle2):
+    return skycoin.coin_Transaction_Verify(handle2)
+
+def AddUint64(p0, p1):
+    return skycoin.SKY_coin_AddUint64(p0, p1)
+
+def Uint64ToInt64(s):
+    return skycoin.SKY_coin_Uint64ToInt64(s)
+
+def Int64ToUint64(s):
+    return skycoin.SKY_coin_Int64ToUint64(s)
+
+def SHA256():
+    return skycoin.cipher_SHA256()
+
+def UxBodyHash(uxb, hashx):
+    return skycoin.SKY_coin_UxBody_Hash(uxb, hashx)
+
+def UxOutSnapshotHash(uxo, hn):
+    return skycoin.SKY_coin_UxOut_SnapshotHash(uxo, hn) 
+
+def UxOutCoinHours(uxo, now):
+    return skycoin.SKY_coin_UxOut_CoinHours(uxo, now)
+
+def UxArrayCoins(uxa):
+    return skycoin.SKY_coin_UxArray_Coins(uxa)
+
+def UxArrayCoinHours(uxa, num):
+    return skycoin.SKY_coin_UxArray_CoinHours(uxa, num)
+
+def UxArrayHashes(uxa):
+    return skycoin.SKY_coin_UxArray_Hashes(uxa)
+
+def UxArrayHasDupes(uxa):
+    return skycoin.SKY_coin_UxArray_HasDupes(uxa)
+
+def UxArraySub(uxc, uxa):
+    return skycoin.SKY_coin_UxArray_Sub(uxc, uxa)
+
+def UxArrayLess(uxa, p0, p1):
+    return skycoin.SKY_coin_UxArray_Less(uxa, p0, p1)
+
+def UxArraySwap(uxa, p0, p1):
+    return skycoin.SKY_coin_UxArray_Swap(uxa, p0, p1)
+
+def NewAddressUxOuts(uxa):
+    return skycoin.SKY_coin_NewAddressUxOuts(uxa)
+
+def AddressUxOutsKeys(uxH):
+    return skycoin.SKY_coin_AddressUxOuts_Keys(uxH)
+
+def AddressUxOutsSet(uxH,uxa_Body_Address,ux_2):
+    return skycoin.SKY_coin_AddressUxOuts_Set(uxH,uxa_Body_Address,ux_2)

skycoin/encrypt.py

@@ -0,0 +1,16 @@
+from libpy import skycoin
+
+def Sha256XorEncrypt(data, cadena):
+    return skycoin.SKY_encrypt_Sha256Xor_Encrypt(data, cadena)
+
+def Sha256XorDecrypt(p0, p1):
+    return skycoin.SKY_encrypt_Sha256Xor_Decrypt(p0, p1)
+
+def ScryptChacha20poly1305():
+    return skycoin.encrypt__ScryptChacha20poly1305()
+
+def ScryptChacha20poly1305Encrypt(crypt, plaintext, passwd):
+    return skycoin.SKY_encrypt_ScryptChacha20poly1305_Encrypt(crypt, plaintext, passwd)
+
+def ScryptChacha20poly1305Decrypt(crypt, encrypto, password):
+    return skycoin.SKY_encrypt_ScryptChacha20poly1305_Decrypt(crypt, encrypto, password)