Merge pull request #639 from alpha-wallet/with-nervos-web3

with nervos as web3js provider for dapp browser
pull/645/head
James Sangalli 6 years ago committed by GitHub
commit a69134657d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      AlphaWallet/Info.plist
  2. 2
      Podfile
  3. 12
      Podfile.lock

@ -28,7 +28,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>215</string>
<string>217</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>

@ -23,7 +23,7 @@ target 'AlphaWallet' do
pod 'CryptoSwift'
pod 'SwiftyXMLParser', :git => 'https://github.com/yahoojapan/SwiftyXMLParser.git'
pod 'Kingfisher', '~> 4.0'
pod 'TrustWeb3Provider', :git=>'https://github.com/TrustWallet/trust-web3-provider', :commit=>'f4e0ebb1b8fa4812637babe85ef975d116543dfd'
pod 'TrustWeb3Provider', :git=>'https://github.com/alpha-wallet/dapp-web3-provider', :branch => 'nervos-dist'
pod 'TrustKeystore', :git => 'https://github.com/alpha-wallet/trust-keystore.git', :branch => 'alphawallet'
pod 'SwiftyJSON'
pod 'web3swift', :git => 'https://github.com/alpha-wallet/web3swift.git', :branch => 'alphawallet'

@ -93,7 +93,7 @@ DEPENDENCIES:
- SwiftyJSON
- SwiftyXMLParser (from `https://github.com/yahoojapan/SwiftyXMLParser.git`)
- TrustKeystore (from `https://github.com/alpha-wallet/trust-keystore.git`, branch `alphawallet`)
- TrustWeb3Provider (from `https://github.com/TrustWallet/trust-web3-provider`, commit `f4e0ebb1b8fa4812637babe85ef975d116543dfd`)
- TrustWeb3Provider (from `https://github.com/alpha-wallet/dapp-web3-provider`, branch `nervos-dist`)
- web3swift (from `https://github.com/alpha-wallet/web3swift.git`, branch `alphawallet`)
SPEC REPOS:
@ -138,8 +138,8 @@ EXTERNAL SOURCES:
:branch: alphawallet
:git: https://github.com/alpha-wallet/trust-keystore.git
TrustWeb3Provider:
:commit: f4e0ebb1b8fa4812637babe85ef975d116543dfd
:git: https://github.com/TrustWallet/trust-web3-provider
:branch: nervos-dist
:git: https://github.com/alpha-wallet/dapp-web3-provider
web3swift:
:branch: alphawallet
:git: https://github.com/alpha-wallet/web3swift.git
@ -155,8 +155,8 @@ CHECKOUT OPTIONS:
:commit: c819647f4b3c5b149b61268eecd5a0805fbf6498
:git: https://github.com/alpha-wallet/trust-keystore.git
TrustWeb3Provider:
:commit: f4e0ebb1b8fa4812637babe85ef975d116543dfd
:git: https://github.com/TrustWallet/trust-web3-provider
:commit: 3982bf7bfa956839d33d7616247631c6375fc450
:git: https://github.com/alpha-wallet/dapp-web3-provider
web3swift:
:commit: e158b947f0f541ddf09461f4b73d960bde1dadcd
:git: https://github.com/alpha-wallet/web3swift.git
@ -197,6 +197,6 @@ SPEC CHECKSUMS:
TrustWeb3Provider: 50fa391bdf170feb43dd4419992931510a5751d8
web3swift: ec721fe509a4b3ca7abdf027d186d07fce65be8f
PODFILE CHECKSUM: ab5c3543229c5209bd644442b4501f028619ae92
PODFILE CHECKSUM: d32ff5d8a05bd2e3997b22c3d29c454caeffca4e
COCOAPODS: 1.5.3

Loading…
Cancel
Save