From 5ab8a9cf001fe87367557781e4724c6dbbfadf08 Mon Sep 17 00:00:00 2001 From: Ryan Berckmans Date: Sat, 13 Jul 2024 02:25:28 -0500 Subject: [PATCH 1/5] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be3085f..ed89fa7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![staging release](https://github.com/3cities/3cities/actions/workflows/1-deploy-main-to-staging.yml/badge.svg)](https://github.com/3cities/3cities/actions/workflows/1-deploy-main-to-staging.yml) [![prod release](https://github.com/3cities/3cities/actions/workflows/2-deploy-staging-to-prod.yml/badge.svg)](https://github.com/3cities/3cities/actions/workflows/2-deploy-staging-to-prod.yml) -Easily pay and get paid with 3cities, a decentralized payment processor for Ethereum. +Easily pay, get paid, and process payments on Ethereum. Features - automatic handling of multiple currencies, tokens, and L2s. From 3e490e95bf6ba69ba096394e066b727d93ab8ff5 Mon Sep 17 00:00:00 2001 From: Ryan Berckmans Date: Sat, 13 Jul 2024 02:29:54 -0500 Subject: [PATCH 2/5] Update README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index ed89fa7..c1351f2 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,8 @@ Features Individuals can use 3cities to send or receive payments, donations, transfers, or deposits. Merchants can use 3cities to be accept transactional payments and self-process those payments offchain (be your own payment processor). Payments can be in USD or ETH, with EUR and other currencies soon to come. + +# Trusted by + +- [Devcon 7](https://devcon.org/en/tickets/) Ticket Payments +- [Week in Ethereum News](https://weekinethereumnews.com/) Job Ad Payments From 6a5dd964c1830e8b751649a28b840778453dab14 Mon Sep 17 00:00:00 2001 From: Ryan Berckmans Date: Sat, 13 Jul 2024 02:32:04 -0500 Subject: [PATCH 3/5] Update README --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c1351f2..2f7eeec 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,9 @@ Features - one-time or reusable [pay request links](https://3cities.xyz/#/pay-link) - merchant transactional payment, they pay using a pop-up without leaving your site - with no fees or API keys -3cities is a tool to pay and get paid on Ethereum. +3cities is a tool to help people pay and get paid on Ethereum. -3cities is not a wallet, it's an app that lets you connect your wallet. - -3cities is not a token or a chain, it's an app that automatically searches the payment sender's wallet for the best payment method across ten popular tokens and a dozen L2s. +3cities is not a wallet. It's an app that automatically searches the sender's wallet for the best way to pay across ten popular tokens and a dozen L2s. Individuals can use 3cities to send or receive payments, donations, transfers, or deposits. From ef05eda4e86c113081c4fb420a77eb0e94bfc0cc Mon Sep 17 00:00:00 2001 From: Ryan Berckmans Date: Sat, 13 Jul 2024 02:50:48 -0500 Subject: [PATCH 4/5] Don't depend on forge to run 'yarn build' in root --- packages/eth-transfer-proxy/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/eth-transfer-proxy/package.json b/packages/eth-transfer-proxy/package.json index 33fdfd2..430e473 100644 --- a/packages/eth-transfer-proxy/package.json +++ b/packages/eth-transfer-proxy/package.json @@ -36,7 +36,8 @@ "build:esm": "yarn clean:esm && tsc --outDir ./dist/esm --sourceMap", "build:types": "yarn clean:types && tsc --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap", "build:ts": "yarn build:cjs && yarn build:esm && yarn build:types", - "build": "yarn build:forge && yarn build:gen && yarn build:ts", + "build:all": "yarn build:forge && yarn build:gen && yarn build:ts # we omit forge from standard 'yarn build' so that clients who only want eg. grpc service don't need to install forge to make a root `yarn build` succeed", + "build": "yarn build:ts", "build:dev": "yarn build # NB eth-transfer-proxy has no dev build, but we include this so that the root build:dev task works for all packages", "build:prod-test": "yarn build # NB eth-transfer-proxy has no prod-test build, but we include this so that the root build:prod-test task works for all packages", "deploy:local": "PRIVATE_KEY='' MNEMONIC='' forge script script/Deploy.s.sol --broadcast --fork-url http://localhost:8545", From 69d6b1163a1ed547d41fade8988ceddd3f516e1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2024 07:52:30 +0000 Subject: [PATCH 5/5] Bump forge-std from v1.8.1 to v1.9.1 Bumps [forge-std](https://github.com/foundry-rs/forge-std) from v1.8.1 to v1.9.1. - [Release notes](https://github.com/foundry-rs/forge-std/releases) - [Commits](https://github.com/foundry-rs/forge-std/compare/bb4ceea94d6f10eeb5b41dc2391c6c8bf8e734ef...07263d193d621c4b2b0ce8b4d54af58f6957d97d) --- updated-dependencies: - dependency-name: forge-std dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- packages/eth-transfer-proxy/package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/eth-transfer-proxy/package.json b/packages/eth-transfer-proxy/package.json index 430e473..710d864 100644 --- a/packages/eth-transfer-proxy/package.json +++ b/packages/eth-transfer-proxy/package.json @@ -18,7 +18,7 @@ } }, "dependencies": { - "forge-std": "github:foundry-rs/forge-std#v1.8.1" + "forge-std": "github:foundry-rs/forge-std#v1.9.1" }, "devDependencies": { "solhint": "^5.0.1" diff --git a/yarn.lock b/yarn.lock index d7371ab..9cd0e76 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7515,9 +7515,10 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" -"forge-std@github:foundry-rs/forge-std#v1.8.1": - version "1.7.6" - resolved "https://codeload.github.com/foundry-rs/forge-std/tar.gz/bb4ceea94d6f10eeb5b41dc2391c6c8bf8e734ef" +"forge-std@github:foundry-rs/forge-std#v1.9.1": + version "1.9.1" + uid "07263d193d621c4b2b0ce8b4d54af58f6957d97d" + resolved "https://codeload.github.com/foundry-rs/forge-std/tar.gz/07263d193d621c4b2b0ce8b4d54af58f6957d97d" fork-ts-checker-webpack-plugin@^6.5.0: version "6.5.3"