Merge payments dev branch.

golemfactory · Nov 17, 2023 · f106866 · f106866
2 parents 57251df + 79bd3b8
commit f106866
Show file tree

Hide file tree

Showing 122 changed files with 9,233 additions and 6,012 deletions.
diff --git a/.env-template b/.env-template
@@ -53,29 +53,24 @@ YAGNA_DATADIR="."
 #POLYGON_GETH_ADDR=https://bor.golem.network,https://polygon-rpc.com
 #MUMBAI_GETH_ADDR=https://matic-mumbai.chainstacklabs.com
 
-## ERC20 driver.
-#ETH_FAUCET_ADDRESS=http://faucet.testnet.golem.network:4000/donate
-#ERC20_RINKEBY_REQUIRED_CONFIRMATIONS=3
-#ERC20_MAINNET_REQUIRED_CONFIRMATIONS=5
+## T/GLM contract addresses
 #RINKEBY_TGLM_CONTRACT_ADDRESS=0xd94e3DC39d4Cad1DAd634e7eb585A57A19dC7EFE
 #RINKEBY_TGLM_FAUCET_ADDRESS=0x59259943616265A03d775145a2eC371732E2B06C
 #MAINNET_GLM_CONTRACT_ADDRESS=0x7DD9c5Cba05E151C895FDe1CF355C9A1D5DA6429
-#ERC20_SENDOUT_INTERVAL_SECS=10
-#ERC20_CONFIRMATION_INTERVAL_SECS=5
 
-## ZkSync driver
-#ZKSYNC_RINKEBY_RPC_ADDRESS=https://rinkeby-api.zksync.io/jsrpc
-#ZKSYNC_MAINNET_RPC_ADDRESS=https://api.zksync.io/jsrpc
-#ZKSYNC_ETH_CONFIRMATION_TIMEOUT_SECONDS=60
-#ZKSYNC_FAUCET_ADDR=
-#ZKSYNC_SENDOUT_INTERVAL_SECS=10
-#ZKSYNC_CONFIRMATION_INTERVAL_SECS=5
+## Eth faucet address
+#ETH_FAUCET_ADDRESS=http://faucet.testnet.golem.network:4000/donate
 
-# ZkSync driver asserts additional funds available to make `N` transactions
-#TRANSACTIONS_PER_ALLOCATION=10
-# However if transaction's fee gets higher, it does not exceed max surcharge for allocation (in GLM)
-#MAX_ALLOCATION_SURCHARGE=200
+## ERC20 driver.
+#ERC20_SENDOUT_INTERVAL_SECS=10
+#ERC20_CONFIRMATION_INTERVAL_SECS=5
+#ERC20_RINKEBY_REQUIRED_CONFIRMATIONS=3
+#ERC20_MAINNET_REQUIRED_CONFIRMATIONS=5
 
+## ERC20Next driver.
+#ERC20NEXT_SENDOUT_INTERVAL_SECS=10
+#ERC20NEXT_RINKEBY_REQUIRED_CONFIRMATIONS=3
+#ERC20NEXT_MAINNET_REQUIRED_CONFIRMATIONS=5
 
 ## Activity Service
 

diff --git a/.github/workflows/binaries-aarch64.yml b/.github/workflows/binaries-aarch64.yml
@@ -10,11 +10,13 @@ on:
   push:
     branches:
       - master
+      - payments-dev
       - release/*
       - '**/all-tests'
   pull_request:
     branches:
       - master
+      - payments-dev
       - release/*
 
 env:
@@ -30,7 +32,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup toolchain
+      - name: Install Rust ${{ env.rust_stable }}
         uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ env.rust_stable }}

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -19,12 +19,14 @@ on:
   push:
     branches:
       - master
+      - payments-dev
       - release/*
       - '**/all-tests'
       - '**/integration-tests'
   pull_request:
     branches:
       - master
+      - payments-dev
       - release/*
 
 jobs:

diff --git a/.github/workflows/market-test-suite.yml b/.github/workflows/market-test-suite.yml
@@ -10,11 +10,13 @@ on:
   push:
     branches:
       - master
+      - payments-dev
       - release/*
       - '**/all-tests'
   pull_request:
     branches:
       - master
+      - payments-dev
       - release/*
 
 env:

diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
@@ -15,6 +15,7 @@ on:
   pull_request:
     branches:
       - master
+      - payments-dev
       - release/*
 
 env:

diff --git a/.github/workflows/unit-test-sgx.yml b/.github/workflows/unit-test-sgx.yml
@@ -10,11 +10,13 @@ on:
   push:
     branches:
       - master
+      - payments-dev
       - release/*
       - '**/all-tests'
   pull_request:
     branches:
       - master
+      - payments-dev
       - release/*
 
 env:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -10,11 +10,13 @@ on:
   push:
     branches:
       - master
+      - payments-dev
       - release/*
       - '**/all-tests'
   pull_request:
     branches:
       - master
+      - payments-dev
       - release/*
 
 env:
@@ -25,7 +27,7 @@ jobs:
     name: Unit Tests
     env:
       # `-D warnings` means any warnings emitted will cause build to fail
-      RUSTFLAGS: "-D warnings -C opt-level=z -C target-cpu=x86-64 -C debuginfo=1"
+      RUSTFLAGS: "-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1"
       X86_64_PC_WINDOWS_MSVC_OPENSSL_DIR: c:/vcpkg/installed/x64-windows
     runs-on: ${{ matrix.os }}
     strategy:
@@ -53,18 +55,6 @@ jobs:
           command: tree
           args: --locked
 
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - name: Check clippy lints
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --all-targets --all-features --workspace -- -D warnings
-
       - name: Install openssl ( Windows only )
         if: runner.os == 'Windows'
         run: |

diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,11 @@ workdir/*
 core/market/decentralized/tests/test-workdir/*
 releases/
 
+# erc20next
+db.sqlite
+db.sqlite-shm
+db.sqlite-wal
+
 # IDEs
 .idea
 .vs