[ BDH-60 ] Solver integrated with latest upstream, and proxy-ethnode branch changes

.github/workflows/deploy.yml

@@ -0,0 +1,66 @@
+name: Deploy to ECR
+
+on:
+
+  push:
+    branches: [ proxy-ethnode, test ]
+
+jobs:
+
+  build:
+
+    name: Build Image
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ vars.AWS_REGION }}
+
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+
+    - name: Build, tag, and push image to Amazon ECR
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        ECR_REPOSITORY: ${{ vars.AWS_REPOSITORY }}
+        IMAGE_TAG: ${{ github.sha }}
+      run: |
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+  deploy:
+    name: Deploy Image and Env Variables
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Deploy
+        uses: peterkimzz/aws-ssm-send-command@master
+        id: deploy
+        with:
+          aws-region: ${{ vars.AWS_REGION }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          instance-ids: ${{ secrets.INSTANCE_ID }}
+          working-directory: /root/stackup-bundler
+          command: |
+            aws ecr get-login-password --region ${{ vars.AWS_REGION }} | docker login --username AWS --password-stdin ${{ vars.ECR_URL }}
+            yq w -i docker-compose.yaml 'services.stackup-bundler.image' ${{ vars.ECR_URL }}/${{ vars.AWS_REPOSITORY }}:${{ github.sha }} 
+            yq w -i docker-compose.yaml 'services.stackup-bundler.environment[0]' "ERC4337_BUNDLER_ETH_CLIENT_URL=${{ vars.ERC4337_BUNDLER_ETH_CLIENT_URL }}" 
+            yq w -i docker-compose.yaml 'services.stackup-bundler.environment[1]' "ERC4337_BUNDLER_PRIVATE_KEY=${{ secrets.ERC4337_BUNDLER_PRIVATE_KEY }}" 
+            yq w -i docker-compose.yaml 'services.stackup-bundler.environment[2]' "ERC4337_BUNDLER_MAX_BATCH_GAS_LIMIT=${{ vars.ERC4337_BUNDLER_MAX_BATCH_GAS_LIMIT }}" 
+            yq w -i docker-compose.yaml 'services.stackup-bundler.environment[3]' "ERC4337_BUNDLER_DEBUG_MODE=${{ vars.ERC4337_BUNDLER_DEBUG_MODE }}" 
+            yq w -i docker-compose.yaml 'services.stackup-bundler.environment[4]' "SOLVER_URL=${{ vars.SOLVER_URL }}"
+            docker-compose up -d
+
+      # Catch SSM outputs
+      - name: Get the outputs from Deploy image
+        run: echo "The Command id is ${{ steps.deploy.outputs.command-id }}"

.gitignore

@@ -18,3 +18,9 @@
 .DS_Store
 tmp
 .env
+
+# Goland ide
+.idea
+
+# v code
+launch.json

e2e/README.md

@@ -10,14 +10,14 @@ Below are instructions on how to run a series of E2E tests to check that everyth
 
 The steps in the following section assumes that all these tools have been installed and ready to go.
 
-- Node.JS >= 18
-- [Geth](https://geth.ethereum.org/docs/getting-started/installing-geth)
+- Node.JS = 18
+- [Geth](tested with 1.13.5 https://geth.ethereum.org/docs/getting-started/installing-geth)
 
 ## Setting the environment
 
 To reduce the impact of external factors, we'll run the E2E test using an isolated local instance of both geth and the bundler.
 
-First, we'll need to run a local instance of geth with the following command:
+First, in a new tab/pane run a local instance of geth with the following command:
 
 ```bash
 geth \
@@ -34,19 +34,26 @@ geth \
   --miner.gaslimit 12000000
 ```
 
-In a separate process, navigate to the [eth-infinitism/account-abstraction](https://github.com/eth-infinitism/account-abstraction/) directory and run the following command to deploy the required contracts:
+In a separate process,
+- Clone [eth-infinitism/account-abstraction](https://github.com/eth-infinitism/account-abstraction/)
+- Checkout the latest tag that is live on mainnet, currently v0.6.0
+- ```yarn install```
+- Run the following command to deploy the required contracts:
 
 ```bash
 yarn deploy --network localhost
 ```
 
-Next, navigate to the [stackup-wallet/contracts](https://github.com/stackup-wallet/contracts) directory and run the following command to deploy the supporting test contracts:
+- Navigate to the [stackup-wallet/contracts](https://github.com/stackup-wallet/contracts) directory.
+- ```yarn install```
+- Run the following command to deploy the supporting test contracts:
 
 ```bash
 yarn deploy:AllTest --network localhost
 ```
 
-Lastly, run the bundler with the following config:
+- In a new pane/tab `cd ../` to [github.com/blndgs/stackup-bundler](https://github.com/blndgs/stackup-bundler)
+- Set the following environment variables:
 
 ```
 ERC4337_BUNDLER_ETH_CLIENT_URL=http://localhost:8545
@@ -55,10 +62,44 @@ ERC4337_BUNDLER_MAX_BATCH_GAS_LIMIT=12000000
 ERC4337_BUNDLER_DEBUG_MODE=true
 ```
 
+Run the bundler with the following config:
+`make dev-private-mode`
+
 ## Running the test suite
 
-Assuming you have your environment properly setup, you can use the following commands to run the QA test suite.
+- Navigate to stackup-wallet/e2e directory (`cd ./e2e`)
+- ```yarn install```
+- check the contents of the `config.json` file to ensure the `private key` matches the `ERC4337_BUNDLER_PRIVATE_KEY` environment variable set above.
+- Use the following command to run the eth_infinitism test suite.
 
 ```bash
-yarn run test
+yarn run test # see note below if you get a sender_address error
+```
+
+** _Note: try the following step_
+edit the `setup.ts` file and hardcode the `config.ts` contents into a config object. This is a temporary workaround until a solution for reading `config.ts`.
+
+```typescript
+import { fundIfRequired } from "./src/helpers";
+// import config from "./config";
+
+const config = {
+    // This is for testing only. DO NOT use in production.
+    // signingKey: '19b8ac9d574d2dcddc3b9f3ae29aec0bb1f13519c8eed4ff8ddcee642076d689',
+    signingKey:
+        "c6cbc5ffad570fdad0544d1b5358a36edeb98d163b6567912ac4754e144d4edb",
+    nodeUrl: "http://localhost:8545",
+    bundlerUrl: "http://localhost:4337",
+
+    // https://github.com/stackup-wallet/contracts/blob/main/contracts/test
+    testERC20Token: "0x3870419Ba2BBf0127060bCB37f69A1b1C090992B",
+    testGas: "0xc2e76Ee793a194Dd930C18c4cDeC93E7C75d567C",
+    testAccount: "0x3dFD39F2c17625b301ae0EF72B411D1de5211325",
+};
+
+// no changes below this line
+export default async function () {
+    // ...
 ```
+
+try again with `yarn run test`

go.mod

@@ -3,17 +3,20 @@ module github.com/stackup-wallet/stackup-bundler
 go 1.20
 
 require (
+	github.com/blndgs/model v0.18.1
 	github.com/deckarep/golang-set/v2 v2.3.0
 	github.com/dgraph-io/badger/v3 v3.2103.5
 	github.com/ethereum/go-ethereum v1.11.5
 	github.com/gin-contrib/cors v1.4.0
-	github.com/gin-gonic/gin v1.9.0
+	github.com/gin-gonic/gin v1.9.1
 	github.com/go-logr/logr v1.2.4
 	github.com/go-logr/zerologr v1.2.3
-	github.com/go-playground/validator/v10 v10.12.0
+	github.com/go-playground/validator/v10 v10.19.0
+	github.com/goccy/go-json v0.10.2
 	github.com/google/go-cmp v0.5.9
 	github.com/metachris/flashbotsrpc v0.6.0
 	github.com/mitchellh/mapstructure v1.5.0
+	github.com/pkg/errors v0.9.1
 	github.com/puzpuzpuz/xsync/v3 v3.0.1
 	github.com/rs/zerolog v1.29.0
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
@@ -30,73 +33,73 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v0.39.0
 	go.opentelemetry.io/otel/trace v1.16.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/text v0.9.0
+	golang.org/x/text v0.14.0
 	google.golang.org/grpc v1.55.0
 )
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
+	github.com/StackExchange/wmi v1.2.1 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect
-	github.com/bytedance/sonic v1.8.0 // indirect
+	github.com/bytedance/sonic v1.11.3 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.1 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.1.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/flatbuffers v1.12.1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/holiman/uint256 v1.2.0 // indirect
+	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.15.15 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
-	github.com/leodido/go-urn v1.2.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.0 // indirect
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
-	github.com/tklauser/go-sysconf v0.3.5 // indirect
-	github.com/tklauser/numcpus v0.2.2 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.9 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect