This repository has been archived by the owner on Mar 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 190
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1658 from ArkEcosystem/develop
chore: merge develop into master
- Loading branch information
Showing
199 changed files
with
28,173 additions
and
2,795 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| name: Format | ||
|
|
||
| on: | ||
| pull_request: | ||
| paths: | ||
| - '**.css' | ||
| - '**.js' | ||
| - '**.ts' | ||
| - '**.vue' | ||
|
|
||
| jobs: | ||
| eslint: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v1 | ||
|
|
||
| - name: Update System | ||
| run: sudo apt-get update | ||
|
|
||
| - name: Ledger | ||
| run: sudo apt-get install libudev-dev libusb-1.0-0-dev | ||
|
|
||
| - name: Install | ||
| run: yarn global add node-gyp && yarn install --frozen-lockfile && npm rebuild | ||
|
|
||
| - name: Run eslint | ||
| run: yarn lint:fix | ||
|
|
||
| - uses: stefanzweifel/[email protected] | ||
| with: | ||
| commit_message: "style: resolve style guide violations" | ||
| branch: ${{ github.head_ref }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "*.{js,vue}": ["npm run lint:fix", "git add"] | ||
| "*.{js,vue}": ["npm run lint:fix"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| export default { | ||
| id: '022d918ed3b2174c4e288c675805fa2e85547cef8ba2020e54ca84c0c4b9b3ba', | ||
| blockId: '9014855312368837997', | ||
| version: 1, | ||
| type: 0, | ||
| typeGroup: 1, | ||
| amount: 1, | ||
| fee: 10000000, | ||
| sender: 'AJjv7WztjJNYHrLAeveG5NgHWp6699ZJwD', | ||
| senderPublicKey: '02275d8577a0ec2b75fc8683282d53c5db76ebc54514a80c2854e419b793ea259a', | ||
| recipientId: 'AdXbS4GKvV6TZVHrNzcYSQKfpenQnFGTxK', | ||
| signature: '304402206db4ffcdff1c6eb19ecdf0f83cf528a34673eac57defbf25298a6f25f9791fd602206f12834a752c11d749c7450c63550e2c09ff01092c23f67941d6695faaa9e0a9', | ||
| confirmations: 444027, | ||
| timestamp: 59960304, | ||
| nonce: '3' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,21 @@ | ||
| import WalletServiceOriginal from '../../../../../src/renderer/services/wallet' | ||
|
|
||
| export default { | ||
| generate: jest.fn(() => { | ||
| return { | ||
| address: 'Address', | ||
| passphrase: 'passphrase' | ||
| } | ||
| }), | ||
| canResignBusiness: jest.fn(() => false), | ||
| getAddressFromPublicKey: jest.fn(address => `public key of ${address}`), | ||
| getPublicKeyFromPassphrase: jest.fn(passphrase => `public key of ${passphrase}`), | ||
| getPublicKeyFromMultiSignatureAsset: jest.fn(multisignature => 'public key of multisignature'), | ||
| generateSecondPassphrase: jest.fn(() => 'second-passphrase'), | ||
| validateAddress: jest.fn(() => true), | ||
| validatePassphrase: jest.fn(() => true), | ||
| validateUsername: jest.fn(WalletServiceOriginal.validateUsername), | ||
| verifyPassphrase: jest.fn(() => true), | ||
| isBip39Passphrase: jest.fn(() => true) | ||
| isBip39Passphrase: jest.fn(() => true), | ||
| isNeoAddress: jest.fn(() => false) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,8 @@ | ||
| export default class { | ||
| export class ARKTransport { | ||
| constructor () { | ||
| this.getAddress = jest.fn(() => ({ | ||
| address: 'DLWeBuwSBFYtUFj8kFB8CFswfvN2ht3yKn', | ||
| publicKey: '0278a28d0eac9916ef46613d9dbac706acc218e64864d4b4c1fcb0c759b6205b2b' | ||
| })) | ||
| this.signTransaction = jest.fn(() => ({ signature: 'SIGNATURE' })) | ||
| this.getAppConfiguration = jest.fn() | ||
| this.getPublicKey = jest.fn(() => '0278a28d0eac9916ef46613d9dbac706acc218e64864d4b4c1fcb0c759b6205b2b') | ||
| this.signMessage = jest.fn(() => 'SIGNATURE') | ||
| this.signTransaction = jest.fn(() => 'SIGNATURE') | ||
| this.getVersion = jest.fn(() => '1.0.0') | ||
| } | ||
| } |
Oops, something went wrong.