Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get recent develop changes #80

Merged
merged 45 commits into from
Oct 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
562c022
continue working on objC bridge
BaldyAsh Sep 19, 2018
c4de9b7
updated pods and fixes for xcode10
BaldyAsh Sep 19, 2018
cd4ef5a
convenience function getAddress added
FesenkoG Sep 19, 2018
1cedd86
pubkey function added
FesenkoG Sep 19, 2018
f94d4e1
all the methods done, but untested
FesenkoG Sep 21, 2018
528e3a5
more methods for ENS interaction added
FesenkoG Sep 25, 2018
7faacd5
Merge branch 'develop' into feature/ENSsupport
skywinder Sep 30, 2018
eb0d7e0
Merge branch 'develop' into feature/SupportObjC
skywinder Sep 30, 2018
0321329
pods updated
FesenkoG Oct 2, 2018
af454c3
Merge branch 'develop'
BaldyAsh Oct 2, 2018
033944b
one more update
FesenkoG Oct 2, 2018
f7e69db
pods reinstalled
FesenkoG Oct 2, 2018
69cd72a
trying to fix Travis
FesenkoG Oct 2, 2018
7ea058e
Merge pull request #53 from matterinc/feature/ENSsupport
shamatar Oct 3, 2018
588b5cd
Merge pull request #54 from matterinc/feature/SupportObjC
shamatar Oct 3, 2018
a1c0b95
Merge pull request #55 from matterinc/feature/readmeImprovement
shamatar Oct 3, 2018
ddaa43e
Start splitting to modules that can be reused by other libraries
shamatar Oct 4, 2018
2c11206
continue cleanup
shamatar Oct 4, 2018
6d30a6f
continue adding files
shamatar Oct 4, 2018
6a05576
remove old pod files
shamatar Oct 4, 2018
202d593
add new pod files
shamatar Oct 4, 2018
425086a
fix tests, move RLP and secp256k1 tests to modules
shamatar Oct 4, 2018
97dfece
fix fallback to scientific in formatting
shamatar Oct 4, 2018
4e1911d
Merge pull request #60 from matterinc/feature/readmeImprovement
shamatar Oct 4, 2018
45a7dab
adds txpool function and its local node test
currybab Oct 12, 2018
ce9388e
added logo
BaldyAsh Oct 13, 2018
4f552f5
Update README.md
BaldyAsh Oct 13, 2018
9ab3494
Merge pull request #66 from matterinc/feature/addingLogo
BaldyAsh Oct 13, 2018
ef4a602
Update README.md
BaldyAsh Oct 13, 2018
47021be
deleted red folders
BaldyAsh Oct 17, 2018
d6a710c
started erc721
BaldyAsh Oct 17, 2018
568ec5d
finished erc721
BaldyAsh Oct 17, 2018
bf7538d
fixed erc721 and updated pods
BaldyAsh Oct 17, 2018
784473f
Merge pull request #64 from currybab/feature/pendingTransactions
shamatar Oct 18, 2018
125832e
Merge pull request #67 from matterinc/feature/erc721
shamatar Oct 18, 2018
5fdeb52
add txpool content as native types
shamatar Oct 18, 2018
7d08a89
Function visibility fix
shamatar Oct 22, 2018
57a2cd0
Update changelog
skywinder Oct 25, 2018
1414f31
updated pods
BaldyAsh Oct 25, 2018
e6fdc84
fixed
BaldyAsh Oct 25, 2018
f3f3463
Merge pull request #74 from matterinc/carthage#2
BaldyAsh Oct 25, 2018
647a3fe
Update README.md
BaldyAsh Oct 25, 2018
100bbd2
added eth address pod, fixes in project
BaldyAsh Oct 25, 2018
3a08971
Merge commit 'e6fdc842128038eb23b41fadf74d99f361d7c7e5' into develop
skywinder Oct 26, 2018
e960456
Merge pull request #75 from matterinc/carthage
shamatar Oct 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## Build generated
build/
DerivedData/

.build
## Various settings
*.pbxuser
!default.pbxuser
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ xcode_scheme: web3swift-iOS
xcode_destination: platform=iOS Simulator, OS=12.0, name=iPhone X
before_install:
- gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
- pod install
- pod install --repo-update
script:
- xcodebuild -scheme web3swift-iOS -workspace web3swift.xcworkspace -sdk iphonesimulator build test
after_success:
Expand Down
137 changes: 99 additions & 38 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,104 @@
# Change Log

## [Unreleased](https://github.com/bankex/web3swift/tree/HEAD)
## [Unreleased](https://github.com/matterinc/web3swift/tree/HEAD)

[Full Changelog](https://github.com/matterinc/web3swift/compare/1.5.1...HEAD)

**Implemented enhancements:**

- ENS for wallets [\#12](https://github.com/matterinc/web3swift/issues/12)
- Recover passphrase from BIP32 store [\#5](https://github.com/matterinc/web3swift/issues/5)

**Merged pull requests:**

- hotfix update pods [\#71](https://github.com/matterinc/web3swift/pull/71) ([BaldyAsh](https://github.com/BaldyAsh))

## [1.5.1](https://github.com/matterinc/web3swift/tree/1.5.1) (2018-10-22)
[Full Changelog](https://github.com/matterinc/web3swift/compare/1.5...1.5.1)

**Merged pull requests:**

- Function visibility fix [\#70](https://github.com/matterinc/web3swift/pull/70) ([shamatar](https://github.com/shamatar))

## [1.5](https://github.com/matterinc/web3swift/tree/1.5) (2018-10-18)
[Full Changelog](https://github.com/matterinc/web3swift/compare/1.1.10...1.5)

**Implemented enhancements:**

- Can you add support for ERC-721 tokens [\#7](https://github.com/matterinc/web3swift/issues/7)

**Closed issues:**

- Creating a new wallet is too slow [\#63](https://github.com/matterinc/web3swift/issues/63)
- need to update for Xcode10 [\#49](https://github.com/matterinc/web3swift/issues/49)
- Web3.Utils.formatToEthereumUnits [\#48](https://github.com/matterinc/web3swift/issues/48)
- Interface ideas are welcome for v2.0 [\#3](https://github.com/matterinc/web3swift/issues/3)

**Merged pull requests:**

- Add TxPool and ERC721 native class [\#68](https://github.com/matterinc/web3swift/pull/68) ([shamatar](https://github.com/shamatar))
- Feature/erc721 [\#67](https://github.com/matterinc/web3swift/pull/67) ([BaldyAsh](https://github.com/BaldyAsh))
- Feature/adding logo [\#66](https://github.com/matterinc/web3swift/pull/66) ([BaldyAsh](https://github.com/BaldyAsh))
- adds txpool function and its local node test [\#64](https://github.com/matterinc/web3swift/pull/64) ([currybab](https://github.com/currybab))
- License got reverted somewhere after PRs [\#60](https://github.com/matterinc/web3swift/pull/60) ([shamatar](https://github.com/shamatar))

## [1.1.10](https://github.com/matterinc/web3swift/tree/1.1.10) (2018-10-04)
[Full Changelog](https://github.com/matterinc/web3swift/compare/1.1.9...1.1.10)

**Merged pull requests:**

- Preliminary ENS support, start module splitting [\#59](https://github.com/matterinc/web3swift/pull/59) ([shamatar](https://github.com/shamatar))
- Feature/readme improvement [\#55](https://github.com/matterinc/web3swift/pull/55) ([BaldyAsh](https://github.com/BaldyAsh))
- Feature/support obj c [\#54](https://github.com/matterinc/web3swift/pull/54) ([BaldyAsh](https://github.com/BaldyAsh))
- Feature/ENSsupport [\#53](https://github.com/matterinc/web3swift/pull/53) ([FesenkoG](https://github.com/FesenkoG))
- Add Travis configuration [\#52](https://github.com/matterinc/web3swift/pull/52) ([skywinder](https://github.com/skywinder))
- Added ERC-20 token for testing web3swift lib [\#50](https://github.com/matterinc/web3swift/pull/50) ([BaldyAsh](https://github.com/BaldyAsh))

## [1.1.9](https://github.com/matterinc/web3swift/tree/1.1.9) (2018-09-18)
[Full Changelog](https://github.com/matterinc/web3swift/compare/1.1.7...1.1.9)

**Fixed bugs:**

- eth.getAccounts\(\) function returns an empty address Array [\#24](https://github.com/matterinc/web3swift/issues/24)
- EIP681 bug fixes, accessibility in Function changed [\#35](https://github.com/matterinc/web3swift/pull/35) ([FesenkoG](https://github.com/FesenkoG))

**Closed issues:**

- the version 1.1.6 couldn't from password and keystore to get the privateKey [\#32](https://github.com/matterinc/web3swift/issues/32)
- Need implementation of EIP-681 parsing [\#25](https://github.com/matterinc/web3swift/issues/25)

**Merged pull requests:**

- Update for XCode 10 [\#39](https://github.com/matterinc/web3swift/pull/39) ([shamatar](https://github.com/shamatar))
- Basic ENS support added, EIP681 parsing supports ENS from now. [\#38](https://github.com/matterinc/web3swift/pull/38) ([FesenkoG](https://github.com/FesenkoG))

## [1.1.7](https://github.com/matterinc/web3swift/tree/1.1.7) (2018-09-13)
[Full Changelog](https://github.com/matterinc/web3swift/compare/1.1.6...1.1.7)

**Fixed bugs:**

- Thread blocked [\#16](https://github.com/matterinc/web3swift/issues/16)

**Closed issues:**

- How to create same address and keystore by mnemonics? [\#22](https://github.com/matterinc/web3swift/issues/22)

**Merged pull requests:**

- Fix ethereum address parsing, add readme [\#34](https://github.com/matterinc/web3swift/pull/34) ([shamatar](https://github.com/shamatar))
- complete EIP681, fix the most stupid Ethereum address parsing [\#33](https://github.com/matterinc/web3swift/pull/33) ([shamatar](https://github.com/shamatar))
- Add examples to readme, prettify formatting [\#31](https://github.com/matterinc/web3swift/pull/31) ([skywinder](https://github.com/skywinder))
- continue eip681 work [\#27](https://github.com/matterinc/web3swift/pull/27) ([shamatar](https://github.com/shamatar))
- Implement EIP681 parser \(untested\) [\#26](https://github.com/matterinc/web3swift/pull/26) ([shamatar](https://github.com/shamatar))
- Change access control of function fromRaw in struct EthereumTransaction [\#11](https://github.com/matterinc/web3swift/pull/11) ([Plazmathron](https://github.com/Plazmathron))

## [1.1.6](https://github.com/matterinc/web3swift/tree/1.1.6) (2018-09-04)
[Full Changelog](https://github.com/matterinc/web3swift/compare/1.1.5...1.1.6)

**Merged pull requests:**

- Quick fix for scrypt performance [\#17](https://github.com/matterinc/web3swift/pull/17) ([shamatar](https://github.com/shamatar))
- adding description string to Web3Error [\#1](https://github.com/matterinc/web3swift/pull/1) ([GabCas](https://github.com/GabCas))

[Full Changelog](https://github.com/bankex/web3swift/compare/0.6.0...HEAD)

Expand Down Expand Up @@ -237,43 +335,6 @@
- Wrong conversation of the Wei. [\#2](https://github.com/BANKEX/web3swift/issues/2)
- How to connect to a Localhost Node? [\#1](https://github.com/BANKEX/web3swift/issues/1)

## [0.2.8](https://github.com/bankex/web3swift/tree/0.2.8) (2018-01-18)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.2.7...0.2.8)

## [0.2.7](https://github.com/bankex/web3swift/tree/0.2.7) (2018-01-15)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.2.5...0.2.7)

## [0.2.5](https://github.com/bankex/web3swift/tree/0.2.5) (2018-01-12)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.2.0...0.2.5)

## [0.2.0](https://github.com/bankex/web3swift/tree/0.2.0) (2017-12-30)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.1.2...0.2.0)

## [0.1.2](https://github.com/bankex/web3swift/tree/0.1.2) (2017-12-27)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.1.1...0.1.2)

## [0.1.1](https://github.com/bankex/web3swift/tree/0.1.1) (2017-12-26)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.1.0...0.1.1)

## [0.1.0](https://github.com/bankex/web3swift/tree/0.1.0) (2017-12-26)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.0.6...0.1.0)

## [0.0.6](https://github.com/bankex/web3swift/tree/0.0.6) (2017-12-26)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.0.5...0.0.6)

## [0.0.5](https://github.com/bankex/web3swift/tree/0.0.5) (2017-12-21)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.0.4...0.0.5)

## [0.0.4](https://github.com/bankex/web3swift/tree/0.0.4) (2017-12-21)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.0.3...0.0.4)

## [0.0.3](https://github.com/bankex/web3swift/tree/0.0.3) (2017-12-20)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.0.2...0.0.3)

## [0.0.2](https://github.com/bankex/web3swift/tree/0.0.2) (2017-12-20)
[Full Changelog](https://github.com/bankex/web3swift/compare/0.0.1...0.0.2)

## [0.0.1](https://github.com/bankex/web3swift/tree/0.0.1) (2017-12-19)


\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
8 changes: 5 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
def import_pods
pod 'scrypt', '~> 2.0'
pod "PromiseKit", "~> 6.3"
pod "PromiseKit", "~> 6.4.1"
pod 'BigInt', '~> 3.1'
pod 'CryptoSwift', '~> 0.11'
pod 'CryptoSwift', '~> 0.12'
pod 'Result', '~> 4.0'
pod 'secp256k1_ios', :git => 'https://github.com/shamatar/secp256k1_ios.git', :modular_headers => true
pod 'secp256k1_swift', '~> 1.0.3', :modular_headers => true
pod 'SwiftRLP', '~> 1.1'
pod 'EthereumAddress', '~> 1.0.0'
end

target 'web3swift-macOS' do
Expand Down
36 changes: 19 additions & 17 deletions Podfile.lock
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
PODS:
- BigInt (3.1.0):
- SipHash (~> 1.2)
- CryptoSwift (0.12.0)
- CryptoSwift (0.13.0)
- EthereumAddress (1.0.0):
- CryptoSwift (~> 0.13)
- PromiseKit (6.4.1):
- PromiseKit/CorePromise (= 6.4.1)
- PromiseKit/Foundation (= 6.4.1)
Expand All @@ -14,44 +16,44 @@ PODS:
- Result (4.0.0)
- scrypt (2.0):
- CryptoSwift (~> 0.11)
- secp256k1_ios (0.1.3)
- secp256k1_swift (1.0.3)
- SipHash (1.2.2)
- SwiftRLP (1.1):
- BigInt (~> 3.1)

DEPENDENCIES:
- BigInt (~> 3.1)
- CryptoSwift (~> 0.11)
- PromiseKit (~> 6.3)
- CryptoSwift (~> 0.12)
- EthereumAddress (~> 1.0.0)
- PromiseKit (~> 6.4.1)
- Result (~> 4.0)
- scrypt (~> 2.0)
- secp256k1_ios (from `https://github.com/shamatar/secp256k1_ios.git`)
- secp256k1_swift (~> 1.0.3)
- SwiftRLP (~> 1.1)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- BigInt
- CryptoSwift
- EthereumAddress
- PromiseKit
- Result
- scrypt
- secp256k1_swift
- SipHash

EXTERNAL SOURCES:
secp256k1_ios:
:git: https://github.com/shamatar/secp256k1_ios.git

CHECKOUT OPTIONS:
secp256k1_ios:
:commit: e3ab3e26fafc3688436528f2ca24cc679c7d746e
:git: https://github.com/shamatar/secp256k1_ios.git
- SwiftRLP

SPEC CHECKSUMS:
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
CryptoSwift: 1c07ca50843dd48bc54e6ea53d7a4dba3b645716
CryptoSwift: 16e78bebf567bad1c87b2d58f6547f25b74c31aa
EthereumAddress: f476e1320dca3a0024431e713ede7a09c7eb7796
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84
secp256k1_ios: ac9ef04e761f43c58012b28548afa91493761f17
secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
SwiftRLP: 5512899925f1a9e1c78c902ed3bf857880e814a0

PODFILE CHECKSUM: f6c71566157938ba8afa59f1e6a3ffc11d709d7b
PODFILE CHECKSUM: 9f923f3cffffde022aaef140f9cd311a152e9c49

COCOAPODS: 1.6.0.beta.1
Empty file modified Pods/BigInt/LICENSE.md
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/README.md
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Addition.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/BigInt.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/BigUInt.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Bitwise Ops.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Codable.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Comparable.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Data Conversion.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Division.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Exponentiation.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Floating Point Conversion.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/GCD.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Hashable.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Integer Conversion.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Multiplication.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Prime Test.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Random.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Shifts.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Square Root.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Strideable.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/String Conversion.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Subtraction.swift
100755 → 100644
Empty file.
Empty file modified Pods/BigInt/sources/Words and Bits.swift
100755 → 100644
Empty file.
23 changes: 21 additions & 2 deletions Pods/CryptoSwift/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Pods/CryptoSwift/Sources/CryptoSwift/AES.Cryptors.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Pods/CryptoSwift/Sources/CryptoSwift/BlockDecryptor.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Pods/CryptoSwift/Sources/CryptoSwift/BlockEncryptor.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading