Separated Balances and Prices Calls (uplift to 1.33.x)

[Douglashdaniel]

Uplift of #11244
Uplift of #11280
Resolves brave/brave-browser#19407
Resolves brave/brave-browser#19725

#11280 bug was introduced by #11244 so merging together in this PR.

Pre-approval checklist:

• You have tested your change on Nightly.
• This contains text which needs to be translated.
  • There are more than 7 days before the release.
  • I've notified folks in #l10n on Slack that translations are needed.
• The PR milestones match the branch they are landing to.

Pre-merge checklist:

• You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

• The associated issue milestone is set to the smallest version that the changes is landed on.

[kjozwiak]

Restarting iOS due to dist failing as per https://ci.brave.com/job/pr-brave-browser-separate-balances-and-prices-calls-1.33.x-ios/1/execution/node/113/log/.

 [E2021-11-29T13:58:14.408333-08:00 34309 0 annotate.go:273] original error: no such tag
16:58:14  
16:58:14  goroutine 39:
16:58:14  #0 go.chromium.org/luci/cipd/client/cipd/client.go:1934 - cipd.(*clientImpl).humanErr()
16:58:14  #1 go.chromium.org/luci/cipd/client/cipd/client.go:929 - cipd.(*clientImpl).ResolveVersion()
16:58:14  #2 go.chromium.org/luci/cipd/client/cipd/resolver.go:176 - cipd.(*Resolver).resolveVersion.func1()
16:58:14  #3 go.chromium.org/luci/common/sync/promise/promise.go:84 - promise.(*Promise).runGen()
16:58:14  #4 runtime/asm_arm64.s:1130 - runtime.goexit()
16:58:14  
16:58:14  goroutine 100:
16:58:14  From frame 0 to 0, the following wrappers were found:
16:58:14    internal reason: MultiError 1/1: following first non-nil error.
16:58:14  
16:58:14  #0 go.chromium.org/luci/cipd/client/cipd/ensure/file.go:255 - ensure.(*File).Resolve.func1.1()
16:58:14    reason: failed to resolve infra/python/wheels/numpy/mac-arm64_cp38_cp38@version:1.20.3 (line 0)
16:58:14  
16:58:14  #1 go.chromium.org/luci/common/sync/parallel/runner.go:51 - parallel.(*WorkItem).execute()
16:58:14  #2 go.chromium.org/luci/common/sync/parallel/runner.go:149 - parallel.(*Runner).dispatchLoopBody.func2()
16:58:14  #3 runtime/asm_arm64.s:1130 - runtime.goexit()
16:58:14  
16:58:14  goroutine 1:
16:58:14  #0 go.chromium.org/luci/vpython/venv/config.go:206 - venv.(*Config).makeEnv()
16:58:14    reason: failed to resolve packages
16:58:14  
16:58:14  #1 go.chromium.org/luci/vpython/venv/venv.go:170 - venv.With()
16:58:14  #2 go.chromium.org/luci/vpython/application/subcommand_install.go:61 - application.(*installCommandRun).Run.func1()
16:58:14    reason: failed to setup the environment
16:58:14  
16:58:14  #3 go.chromium.org/luci/vpython/application/support.go:46 - application.run()
16:58:14  #4 go.chromium.org/luci/vpython/application/subcommand_install.go:60 - application.(*installCommandRun).Run()
16:58:14  #5 github.com/maruel/[email protected]/subcommands.go:395 - subcommands.Run()
16:58:14  #6 go.chromium.org/luci/vpython/application/application.go:184 - application.(*application).mainDev()
16:58:14  #7 go.chromium.org/luci/vpython/application/application.go:324 - application.(*application).mainImpl()
16:58:14  #8 go.chromium.org/luci/vpython/application/application.go:416 - application.(*Config).Main.func1()
16:58:14  #9 go.chromium.org/luci/vpython/application/support.go:46 - application.run()
16:58:14  #10 go.chromium.org/luci/vpython/application/application.go:415 - application.(*Config).Main()
16:58:14  #11 vpython/main.go:112 - main.mainImpl()
16:58:14  #12 vpython/main.go:118 - main.main()
16:58:14  #13 runtime/proc.go:225 - runtime.main()
16:58:14  #14 runtime/asm_arm64.s:1130 - runtime.goexit()
16:58:14  Error: Command 'vpython3 -vpython-spec src/.vpython3 -vpython-tool install' returned non-zero exit status 1 in /Users/jenkins/jenkins/workspace/pr-brave-browser-separate-balances-and-prices-calls-1.33.x-ios
16:58:14  [E2021-11-29T13:58:14.408333-08:00 34309 0 annotate.go:273] original error: no such tag
16:58:14  
16:58:14  goroutine 39:
16:58:14  #0 go.chromium.org/luci/cipd/client/cipd/client.go:1934 - cipd.(*clientImpl).humanErr()
16:58:14  #1 go.chromium.org/luci/cipd/client/cipd/client.go:929 - cipd.(*clientImpl).ResolveVersion()
16:58:14  #2 go.chromium.org/luci/cipd/client/cipd/resolver.go:176 - cipd.(*Resolver).resolveVersion.func1()
16:58:14  #3 go.chromium.org/luci/common/sync/promise/promise.go:84 - promise.(*Promise).runGen()
16:58:14  #4 runtime/asm_arm64.s:1130 - runtime.goexit()
16:58:14  
16:58:14  goroutine 100:
16:58:14  From frame 0 to 0, the following wrappers were found:
16:58:14    internal reason: MultiError 1/1: following first non-nil error.
16:58:14  
16:58:14  #0 go.chromium.org/luci/cipd/client/cipd/ensure/file.go:255 - ensure.(*File).Resolve.func1.1()
16:58:14    reason: failed to resolve infra/python/wheels/numpy/mac-arm64_cp38_cp38@version:1.20.3 (line 0)
16:58:14  
16:58:14  #1 go.chromium.org/luci/common/sync/parallel/runner.go:51 - parallel.(*WorkItem).execute()
16:58:14  #2 go.chromium.org/luci/common/sync/parallel/runner.go:149 - parallel.(*Runner).dispatchLoopBody.func2()
16:58:14  #3 runtime/asm_arm64.s:1130 - runtime.goexit()
16:58:14  
16:58:14  goroutine 1:
16:58:14  #0 go.chromium.org/luci/vpython/venv/config.go:206 - venv.(*Config).makeEnv()
16:58:14    reason: failed to resolve packages
16:58:14  
16:58:14  #1 go.chromium.org/luci/vpython/venv/venv.go:170 - venv.With()
16:58:14  #2 go.chromium.org/luci/vpython/application/subcommand_install.go:61 - application.(*installCommandRun).Run.func1()
16:58:14    reason: failed to setup the environment
16:58:14  
16:58:14  #3 go.chromium.org/luci/vpython/application/support.go:46 - application.run()
16:58:14  #4 go.chromium.org/luci/vpython/application/subcommand_install.go:60 - application.(*installCommandRun).Run()
16:58:14  #5 github.com/maruel/[email protected]/subcommands.go:395 - subcommands.Run()
16:58:14  #6 go.chromium.org/luci/vpython/application/application.go:184 - application.(*application).mainDev()
16:58:14  #7 go.chromium.org/luci/vpython/application/application.go:324 - application.(*application).mainImpl()
16:58:14  #8 go.chromium.org/luci/vpython/application/application.go:416 - application.(*Config).Main.func1()
16:58:14  #9 go.chromium.org/luci/vpython/application/support.go:46 - application.run()
16:58:14  #10 go.chromium.org/luci/vpython/application/application.go:415 - application.(*Config).Main()
16:58:14  #11 vpython/main.go:112 - main.mainImpl()
16:58:14  #12 vpython/main.go:118 - main.main()
16:58:14  #13 runtime/proc.go:225 - runtime.main()
16:58:14  #14 runtime/asm_arm64.s:1130 - runtime.goexit()
16:58:14  
16:58:14  null
16:58:14  null
16:58:14  npm ERR! code ELIFECYCLE
16:58:14  npm ERR! errno 1
16:58:14  npm ERR! [email protected] sync: `node ./build/commands/scripts/sync.js "--init" "--target_os=ios"`
16:58:14  npm ERR! Exit status 1
16:58:14  npm ERR! 
16:58:14 
 npm ERR! Failed at the [email protected] sync script.

[kjozwiak]

macOS failed due to browser-test failing due to RewardsContributionBrowserTest.SplitProcessOneTimeTip & RewardsContributionBrowserTest.SplitProcessorAutoContribution as per https://ci.brave.com/job/pr-brave-browser-separate-balances-and-prices-calls-1.33.x-macos/3/testReport/. However, these are known issues as per brave/brave-browser#13883 & brave/brave-browser#13884 and are not related to this specific PR.

[kjozwiak]

Uplift into 1.33.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per https://github.com/brave/brave-core/pull/11244#issuecomment-982388927%20&%20https://github.com/brave/brave-core/pull/11280#issuecomment-983282814.