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.

Sign up for GitHub

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

Jump to bottom

allow a server to charge for api calls #9044

Open
wants to merge 22 commits into
base: dev
Choose a base branch
from
Open

allow a server to charge for api calls #9044

wants to merge 22 commits into from
+6,895 −56

Commits on May 20, 2024

  1. notebooks/payments/00-load-data.ipynb

    @petermchale
    petermchale committed May 20, 2024
    Configuration menu
    Copy the full SHA
    b581021 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'dev' into payments

    @petermchale
    petermchale committed May 21, 2024
    Configuration menu
    Copy the full SHA
    9162245 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into petermchale/payments

    @petermchale
    petermchale committed May 21, 2024
    Configuration menu
    Copy the full SHA
    8789c3e View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge branch 'dev' into petermchale/payments

    @petermchale
    petermchale committed May 23, 2024
    Configuration menu
    Copy the full SHA
    dd99ebe View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. delete notebooks/payments/00-load-data.ipynb

    @petermchale
    petermchale committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a5d7941 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into petermchale/payments

    @petermchale
    petermchale committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    cb73044 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. incorporate 00 and 01 notebook into payments driver code

    @petermchale
    petermchale committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    f722894 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. set and get payment auth tokens

    @petermchale
    petermchale committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    c348a24 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge branch 'dev' into petermchale/payments; concatenated object_ver… 

    …sions in protocol_version.json
    @petermchale
    petermchale committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    27cc81a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into petermchale/payments; fix merge conflicts in … 

    …protocol_version.json by accepting both changes, 'dev' first
    @petermchale
    petermchale committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    99483ae View commit details
    Browse the repository at this point in the history

  3. remove trailing whitespace

    @petermchale
    petermchale committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    8d08bdc View commit details
    Browse the repository at this point in the history

  4. make tab into four spaces

    @petermchale
    petermchale committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    a243d82 View commit details
    Browse the repository at this point in the history

  5. update driver code to reflect new syft api

    @petermchale
    petermchale committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    2f2001f View commit details
    Browse the repository at this point in the history

  6. update demo notebook to reflect new syft api

    @petermchale
    petermchale committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b2f094e View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. initialize node with payment parameters

    @petermchale
    petermchale committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    adf4e55 View commit details
    Browse the repository at this point in the history

  2. change example payment configuration of node

    @petermchale
    petermchale committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    18d94fd View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. implement an example pricing plan for node

    @petermchale
    petermchale committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    3f9f97b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into petermchale/payments; lost payment stuff in r… 

    …un.py and node.py/server.py upon resolving conflicts
    @petermchale
    petermchale committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    dbc306c View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. restore payment stuff after big rename

    @petermchale
    petermchale committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    ba29266 View commit details
    Browse the repository at this point in the history

  2. replace 'node' with 'server'

    @petermchale
    petermchale committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    cb9bd71 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into petermchale/payments

    @petermchale
    petermchale committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    9bd66f2 View commit details
    Browse the repository at this point in the history

  4. change 'node' to 'server' in notebook

    @petermchale
    petermchale committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    12345be View commit details
    Browse the repository at this point in the history