Details

Reviewers

None

Group Reviewers

Restricted Project

Summary

The "holders" of the token qty offered in an Agora offer are the p2pkh addresses of the creating pk.

Make sure the airdrop function takes this into account. Otherwise we will airdrop XEC to Agora scripts.

We convert airdrop functions and tests to typescript to support this.

We also clean up the airdrop calculation functions. Behavior confirmed with existing tests.

Test Plan

npm test

Diff Detail

Repository

rABC Bitcoin ABC

Branch

no-p2sh-airdrops

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 31707
Build 62910: Build Diff	cashtab-tests
Build 62909: arc lint + arc unit

Event Timeline

bytesofman created this revision.Mon, Dec 16, 00:10

Herald added a reviewer: Restricted Project. · View Herald TranscriptMon, Dec 16, 00:10

Harbormaster completed remote builds in B31668: Diff 51606.Mon, Dec 16, 00:14

Build Bitcoin ABC Diffs / Diff Testing (cashtab-tests) failed.

Tail of the build log:

  vectors.js                            |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
 src/transactions                       |   98.79 |     92.3 |     100 |   98.79 |                                                                                                                                                                                                                                                 
  index.js                              |   98.79 |     92.3 |     100 |   98.79 | 175                                                                                                                                                                                                                                             
 src/transactions/fixtures              |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  mocks.ts                              |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  vectors.js                            |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
 src/utils                              |   94.93 |    94.59 |     100 |   94.93 |                                                                                                                                                                                                                                                 
  cashMethods.js                        |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  formatting.ts                         |   94.44 |    93.93 |     100 |   94.44 | 24,54-56                                                                                                                                                                                                                                        
 src/utils/fixtures                     |       0 |        0 |       0 |       0 |                                                                                                                                                                                                                                                 
  vectors.js                            |       0 |        0 |       0 |       0 |                                                                                                                                                                                                                                                 
 src/validation                         |   97.06 |    95.67 |     100 |   97.29 |                                                                                                                                                                                                                                                 
  index.ts                              |   97.06 |    95.67 |     100 |   97.29 | 116-117,282,317,337,384,585,692-693,997,1002                                                                                                                                                                                                    
 src/validation/fixtures                |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  mocks.js                              |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  vectors.js                            |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
 src/wallet                             |   94.96 |    87.78 |   89.06 |   95.12 |                                                                                                                                                                                                                                                 
  context.tsx                           |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  index.ts                              |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  useWallet.ts                          |    91.3 |    79.22 |   79.41 |   91.61 | 140,222-223,604-610,649,654,717-718,729,790,816,859-860,872-887,901,951,979,988-991,1062,1132-1133,1161                                                                                                                                         
 src/wallet/fixtures                    |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  mocks.js                              |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  vectors.js                            |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
----------------------------------------|---------|----------|---------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

##teamcity[blockOpened name='Code Coverage Summary']
##teamcity[buildStatisticValue key='CodeCoverageAbsBCovered' value='5046']
##teamcity[buildStatisticValue key='CodeCoverageAbsBTotal' value='5941']
##teamcity[buildStatisticValue key='CodeCoverageAbsRCovered' value='2808']
##teamcity[buildStatisticValue key='CodeCoverageAbsRTotal' value='3487']
##teamcity[buildStatisticValue key='CodeCoverageAbsMCovered' value='962']
##teamcity[buildStatisticValue key='CodeCoverageAbsMTotal' value='1204']
##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='4952']
##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='5829']
##teamcity[blockClosed name='Code Coverage Summary']

Summary of all failing tests
FAIL src/airdrop/__tests__/index.test.js
  ● Test suite failed to run

    Cannot find module '../../../../modules/mock-chronik-client/dist' from 'src/airdrop/__tests__/index.test.js'

    [0m [90m  6 |[39m [36mimport[39m vectors [36mfrom[39m [32m'airdrop/fixtures/vectors'[39m[33m;[39m
     [90m  7 |[39m [36mimport[39m { initWasm } [36mfrom[39m [32m'ecash-lib'[39m[33m;[39m
    [31m[1m>[22m[39m[90m  8 |[39m [36mimport[39m { [33mMockAgora[39m } [36mfrom[39m [32m'../../../../modules/mock-chronik-client/dist'[39m[33m;[39m
     [90m    |[39m [31m[1m^[22m[39m
     [90m  9 |[39m
     [90m 10 |[39m describe([32m'Cashtab airdrop methods'[39m[33m,[39m () [33m=>[39m {
     [90m 11 |[39m     beforeAll([36masync[39m () [33m=>[39m {[0m

      at Resolver._throwModNotFoundError (node_modules/jest-resolve/build/resolver.js:427:11)
      at Object.require (src/airdrop/__tests__/index.test.js:8:1)


Test Suites: 1 failed, 41 passed, 42 total
Tests:       1103 passed, 1103 total
Snapshots:   0 total
Time:        48.747 s
Ran all test suites.
Build cashtab-tests failed with exit code 1

get it to work

bytesofman edited the summary of this revision. (Show Details)Tue, Dec 17, 20:41

Harbormaster completed remote builds in B31702: Diff 51654.Tue, Dec 17, 20:50

Build Bitcoin ABC Diffs / Diff Testing (cashtab-tests) failed.

Tail of the build log:

Run `npm audit` for details.

> ecash-lib@1.1.0 build
> tsc && tsc -p ./tsconfig.build.json && cp -r ./src/ffi ./dist

Installing ecash-agora dependencies...
/work/modules/ecash-agora /work/modules/ecash-lib /work/modules/ecash-lib-wasm /work/modules/ecash-script /work/modules/chronik-client /work/modules/mock-chronik-client /work/modules/ecashaddrjs /work/abc-ci-builds/cashtab-tests

added 364 packages, and audited 367 packages in 1s

60 packages are looking for funding
  run `npm fund` for details

2 vulnerabilities (1 moderate, 1 high)

To address all issues, run:
  npm audit fix

Run `npm audit` for details.

> ecash-agora@0.2.0 build
> tsc && tsc -p ./tsconfig.build.json

/work/cashtab /work/modules/ecash-agora /work/modules/ecash-lib /work/modules/ecash-lib-wasm /work/modules/ecash-script /work/modules/chronik-client /work/modules/mock-chronik-client /work/modules/ecashaddrjs /work/abc-ci-builds/cashtab-tests
npm warn deprecated @humanwhocodes/config-array@0.11.14: Use @eslint/config-array instead
npm warn deprecated @humanwhocodes/object-schema@2.0.3: Use @eslint/object-schema instead
npm warn deprecated eslint@8.56.0: This version is no longer supported. Please see https://eslint.org/version-support for other options.

added 1489 packages, and audited 3335 packages in 23s

323 packages are looking for funding
  run `npm fund` for details

8 vulnerabilities (6 moderate, 2 high)

To address issues that do not require attention, run:
  npm audit fix

To address all issues (including breaking changes), run:
  npm audit fix --force

Run `npm audit` for details.

> cashtab@3.3.0 build
> node scripts/build.js

Creating an optimized production build...

Treating warnings as errors because process.env.CI = true.
Most CI servers set it automatically.

Failed to compile.

[eslint] 
src/airdrop/index.ts
  Line 7:25:   'TokenIdUtxos' is defined but never used                    @typescript-eslint/no-unused-vars
  Line 12:10:  'MAX_MINT_AMOUNT_TOKEN_SATOSHIS' is defined but never used  @typescript-eslint/no-unused-vars


Build cashtab-tests failed with exit code 1

tsc lint

Harbormaster completed remote builds in B31703: Diff 51655.Tue, Dec 17, 20:56

Build Bitcoin ABC Diffs / Diff Testing (cashtab-tests) failed.

Tail of the build log:

 src/wallet                             |   94.96 |    87.78 |   89.06 |   95.12 |                                                                                                                                                                                                                                                 
  context.tsx                           |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  index.ts                              |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  useWallet.ts                          |    91.3 |    79.22 |   79.41 |   91.61 | 140,222-223,604-610,649,654,717-718,729,790,816,859-860,872-887,901,951,979,988-991,1062,1132-1133,1161                                                                                                                                         
 src/wallet/fixtures                    |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  mocks.js                              |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
  vectors.js                            |     100 |      100 |     100 |     100 |                                                                                                                                                                                                                                                 
----------------------------------------|---------|----------|---------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

##teamcity[blockOpened name='Code Coverage Summary']
##teamcity[buildStatisticValue key='CodeCoverageAbsBCovered' value='5015']
##teamcity[buildStatisticValue key='CodeCoverageAbsBTotal' value='6073']
##teamcity[buildStatisticValue key='CodeCoverageAbsRCovered' value='2764']
##teamcity[buildStatisticValue key='CodeCoverageAbsRTotal' value='3527']
##teamcity[buildStatisticValue key='CodeCoverageAbsMCovered' value='928']
##teamcity[buildStatisticValue key='CodeCoverageAbsMTotal' value='1211']
##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='4928']
##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='5962']
##teamcity[blockClosed name='Code Coverage Summary']

Summary of all failing tests
FAIL src/components/Airdrop/__tests__/Airdrop.test.js
  ● Test suite failed to run

    Cannot find module '../../../../../modules/mock-chronik-client/dist' from 'src/components/Airdrop/__tests__/Airdrop.test.js'

    [0m [90m 27 |[39m } [36mfrom[39m [32m'components/App/fixtures/helpers'[39m[33m;[39m
     [90m 28 |[39m [36mimport[39m [33mCashtabTestWrapper[39m [36mfrom[39m [32m'components/App/fixtures/CashtabTestWrapper'[39m[33m;[39m
    [31m[1m>[22m[39m[90m 29 |[39m [36mimport[39m { [33mMockAgora[39m } [36mfrom[39m [32m'../../../../../modules/mock-chronik-client/dist'[39m[33m;[39m
     [90m    |[39m [31m[1m^[22m[39m
     [90m 30 |[39m [36mimport[39m {
     [90m 31 |[39m     agoraOfferCachetAlphaOne[33m,[39m
     [90m 32 |[39m     cachetCacheMocks[33m,[39m[0m

      at Resolver._throwModNotFoundError (node_modules/jest-resolve/build/resolver.js:427:11)
      at Object.require (src/components/Airdrop/__tests__/Airdrop.test.js:29:1)

FAIL src/airdrop/__tests__/index.test.ts
  ● Test suite failed to run

    Cannot find module '../../../../modules/mock-chronik-client/dist' from 'src/airdrop/__tests__/index.test.ts'

    [0m [90m 12 |[39m [36mimport[39m vectors [36mfrom[39m [32m'airdrop/fixtures/vectors'[39m[33m;[39m
     [90m 13 |[39m [36mimport[39m { initWasm } [36mfrom[39m [32m'ecash-lib'[39m[33m;[39m
    [31m[1m>[22m[39m[90m 14 |[39m [36mimport[39m {
     [90m    |[39m [31m[1m^[22m[39m
     [90m 15 |[39m     [33mMockAgora[39m[33m,[39m
     [90m 16 |[39m     [33mMockChronikClient[39m[33m,[39m
     [90m 17 |[39m } [36mfrom[39m [32m'../../../../modules/mock-chronik-client/dist'[39m[33m;[39m[0m

      at Resolver._throwModNotFoundError (node_modules/jest-resolve/build/resolver.js:427:11)
      at Object.require (src/airdrop/__tests__/index.test.ts:14:1)


Test Suites: 2 failed, 40 passed, 42 total
Tests:       1123 passed, 1123 total
Snapshots:   0 total
Time:        49.74 s
Ran all test suites.
Build cashtab-tests failed with exit code 1

build mock-chronik-client for cashtab tests

Harbormaster completed remote builds in B31704: Diff 51657.Tue, Dec 17, 21:44

Build Bitcoin ABC Diffs / Diff Testing (cashtab-tests) failed.

Tail of the build log:

npm warn deprecated eslint@8.57.1: This version is no longer supported. Please see https://eslint.org/version-support for other options.

> ecashaddrjs@1.6.2 prepublish
> npm run build


> ecashaddrjs@1.6.2 build
> tsc


added 579 packages, and audited 580 packages in 4s

66 packages are looking for funding
  run `npm fund` for details

4 vulnerabilities (3 moderate, 1 high)

To address all issues, run:
  npm audit fix

Run `npm audit` for details.

> ecashaddrjs@1.6.2 build
> tsc

Installing mock-chronik-client dependencies...
/work/modules/mock-chronik-client /work/modules/ecashaddrjs /work/abc-ci-builds/cashtab-tests
npm warn deprecated @humanwhocodes/config-array@0.13.0: Use @eslint/config-array instead
npm warn deprecated @humanwhocodes/object-schema@2.0.3: Use @eslint/object-schema instead
npm warn deprecated glob@8.1.0: Glob versions prior to v9 are no longer supported
npm warn deprecated eslint@8.57.1: This version is no longer supported. Please see https://eslint.org/version-support for other options.

added 349 packages, and audited 352 packages in 2s

60 packages are looking for funding
  run `npm fund` for details

1 high severity vulnerability

To address all issues, run:
  npm audit fix

Run `npm audit` for details.

> mock-chronik-client@2.0.1 build
> tsc

../chronik-client/proto/chronik.ts(2,18): error TS2307: Cannot find module 'long' or its corresponding type declarations.
../chronik-client/proto/chronik.ts(3,17): error TS2307: Cannot find module 'protobufjs/minimal' or its corresponding type declarations.
../chronik-client/src/ChronikClient.ts(5,22): error TS2307: Cannot find module 'ecashaddrjs' or its corresponding type declarations.
../chronik-client/src/ChronikClient.ts(6,23): error TS2307: Cannot find module 'isomorphic-ws' or its corresponding type declarations.
../chronik-client/src/ChronikClient.ts(7,21): error TS2307: Cannot find module 'ws' or its corresponding type declarations.
../chronik-client/src/failoverProxy.ts(5,38): error TS2307: Cannot find module 'axios' or its corresponding type declarations.
../chronik-client/src/failoverProxy.ts(6,23): error TS2307: Cannot find module 'isomorphic-ws' or its corresponding type declarations.
../chronik-client/src/failoverProxy.ts(7,21): error TS2307: Cannot find module 'ws' or its corresponding type declarations.
../chronik-client/src/failoverProxy.ts(186,35): error TS7006: Parameter 'x' implicitly has an 'any' type.
../chronik-client/src/failoverProxy.ts(270,32): error TS7006: Parameter 'e' implicitly has an 'any' type.
../chronik-client/src/failoverProxy.ts(276,30): error TS7006: Parameter 'e' implicitly has an 'any' type.
../chronik-client/src/failoverProxy.ts(294,33): error TS7006: Parameter 'msg' implicitly has an 'any' type.
Build cashtab-tests failed with exit code 2

build chronik-client before mock-chronik-client

Harbormaster completed remote builds in B31706: Diff 51659.Tue, Dec 17, 21:52

lint

Harbormaster completed remote builds in B31707: Diff 51660.Tue, Dec 17, 21:57

bytesofman published this revision for review.Tue, Dec 17, 22:06

D17335 [Modules] Added `bitcoinsuite-chronik-client` to monorepo

·Reviewers: Restricted Owners Package, Restricted Project, bytesofman, tobias_ruck, Fabien

Tue, Dec 17, 15:03

Author: hazzarust

[Cashtab] Do not airdrop XEC to agora scripts
Needs ReviewPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 51660

cashtab/src/airdrop/tests/index.test.js

cashtab/src/airdrop/tests/index.test.ts

cashtab/src/airdrop/fixtures/mocks.js

cashtab/src/airdrop/fixtures/mocks.ts

cashtab/src/airdrop/fixtures/vectors.js

cashtab/src/airdrop/index.ts

cashtab/src/components/Airdrop/tests/Airdrop.test.js

cashtab/src/components/Airdrop/index.tsx

contrib/teamcity/build-configurations.yml

[Cashtab] Do not airdrop XEC to agora scriptsNeeds ReviewPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 51660

cashtab/src/airdrop/__tests__/index.test.js

cashtab/src/airdrop/__tests__/index.test.ts

cashtab/src/airdrop/fixtures/mocks.js

cashtab/src/airdrop/fixtures/mocks.ts

cashtab/src/airdrop/fixtures/vectors.js

cashtab/src/airdrop/index.ts

cashtab/src/components/Airdrop/__tests__/Airdrop.test.js

cashtab/src/components/Airdrop/index.tsx

contrib/teamcity/build-configurations.yml

[Cashtab] Do not airdrop XEC to agora scripts
Needs ReviewPublic
Actions

Revision Contents
Changeset List

cashtab/src/airdrop/tests/index.test.js

cashtab/src/airdrop/tests/index.test.ts

cashtab/src/components/Airdrop/tests/Airdrop.test.js