.github/workflows/cicd-prd.yml

@@ -33,7 +33,6 @@ jobs:
             neo-savant,
             scilla-server,
             zillion,
-            zilliqa-bridge-validator,
           ]
         include:
           - application: bluebell-playground
@@ -91,11 +90,6 @@ jobs:
             path: products/zillion
             tag_length: 8
             tag_latest: false
-          - application: zilliqa-bridge-validator
-            image_name: zilliqa-bridge-validator
-            path: products/bridge/bridge-validators
-            tag_length: 8
-            tag_latest: false
     env:
       DOCKER_DOMAIN: asia-docker.pkg.dev
       REGISTRY: asia-docker.pkg.dev/prj-p-devops-services-tvwmrf63/zilliqa-public
@@ -131,8 +125,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        application:
-          [devex, zilliqa-isolated-server, zilliqa-bridge-web]
+        application: [devex, zilliqa-isolated-server]
         include:
           - application: devex
             image_name: devex
@@ -144,11 +137,6 @@ jobs:
             path: products/zilliqa-isolated-server
             tag_length: 8
             tag_latest: true
-          - application: zilliqa-bridge-web
-            image_name: zilliqa-bridge-web
-            path: products/bridge/bridge-web
-            tag_length: 8
-            tag_latest: false
     env:
       DOCKER_DOMAIN: asia-docker.pkg.dev
       REGISTRY: asia-docker.pkg.dev/prj-p-devops-services-tvwmrf63/zilliqa-public

.github/workflows/cicd-stg.yml

@@ -32,7 +32,6 @@ jobs:
             neo-savant,
             scilla-server,
             zillion,
-            zilliqa-bridge-validator,
           ]
         include:
           - application: devex-apollo
@@ -85,11 +84,6 @@ jobs:
             path: products/zillion
             tag_length: 8
             tag_latest: false
-          - application: zilliqa-bridge-validator
-            image_name: zilliqa-bridge-validator
-            path: products/bridge/bridge-validators
-            tag_length: 8
-            tag_latest: false
     env:
       DOCKER_DOMAIN: asia-docker.pkg.dev
       REGISTRY: asia-docker.pkg.dev/prj-d-devops-services-4dgwlsse/zilliqa-public
@@ -129,8 +123,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        application:
-          [devex, zilliqa-isolated-server, zilliqa-bridge-web]
+        application: [devex, zilliqa-isolated-server]
         include:
           - application: devex
             image_name: devex
@@ -142,11 +135,6 @@ jobs:
             path: products/zilliqa-isolated-server
             tag_length: 8
             tag_latest: true
-          - application: zilliqa-bridge-web
-            image_name: zilliqa-bridge-web
-            path: products/bridge/bridge-web
-            tag_length: 8
-            tag_latest: false
     env:
       DOCKER_DOMAIN: asia-docker.pkg.dev
       REGISTRY: asia-docker.pkg.dev/prj-d-devops-services-4dgwlsse/zilliqa-public

.gitmodules

@@ -1,12 +1,3 @@
-[submodule "products/bridge/smart-contracts/lib/forge-std"]
-	path = products/bridge/smart-contracts/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "products/bridge/smart-contracts/lib/openzeppelin-foundry-upgrades"]
-	path = products/bridge/smart-contracts/lib/openzeppelin-foundry-upgrades
-	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
-[submodule "products/bridge/smart-contracts/lib/openzeppelin-contracts"]
-	path = products/bridge/smart-contracts/lib/openzeppelin-contracts
+[submodule "contracts/experimental/ERC20ProxyForZRC2/lib/openzeppelin-contracts"]
+	path = contracts/experimental/ERC20ProxyForZRC2/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "products/bridge/smart-contracts/lib/openzeppelin-contracts-upgradeable"]
-	path = products/bridge/smart-contracts/lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

.trunk/trunk.yaml

@@ -34,28 +34,14 @@ lint:
     - linters: [gitleaks]
       paths:
         - products/laksaj # laksaj contains a lot of embedded testnet privkeys - ignore them.
-        - products/developer-portal/zq2/docs/api # Contains a lot of hashes, etc. that are interpreted as secrets
-        - products/developer-portal/zq1/docs/api # Contains a lot of hashes, etc. that are interpreted as secrets
-        - products/developer-portal/zq1/docs/scilla/interface.md # contains a lot of hashes
-        - products/developer-portal/zq1/docs/indexer             # contains a lot of hashes
-        - products/developer-portal/zq2/docs/ecosystem/indexer             # contains a lot of hashes
-        - products/developer-portal/zq1/docs/developers/transaction-lifecycle # Contains examples.
-        - products/developer-portal/zq1/docs/developers/developer-toolings
-        - products/developer-portal/zq1/docs/exchanges
-        - products/bridge/smart-contracts/script/config.ts
-        - products/bridge/smart-contracts/script/**/*.s.sol
-        - products/bridge/bridge-web/src/config/config.ts
     - linters: [eslint]
       paths:
         - contracts/audited/burn_zrc2 # eslint barfs on an internal error if you enable it on this directory.
         - contracts/reward_control # and again
-        - products/bridge/bridge-web
+        - products/bech32-hex-converter # eslint chokes.
     - linters: [ALL]
       paths:
         - products/airdrop/**
-        - products/developer-portal/Dockerfile # Annoying, but trunk is now very opinionated on how you write dockerfiles.
-        - products/developer-portal/zq2/docs/js/** # trunk does not know this is looking for metamask in the user's browser.
-        - products/developer-portal/zq2/docs/index.md # contains legitimate empty links
         - needing-organisation/**/*
         - products/devex/public/*.js
         - products/dev-wallet/**

contracts/experimental/ERC20ProxyForZRC2/README.md

@@ -1,21 +1,66 @@
 # ERC20ProxyForZRC2 Contract
 
-This is the contract to deploy a ERC20Proxy for a ZRC2 contract living in the scilla environment. It leverages the precompiles available in Zilliqa to interoperate between the 2 environments.
+These contracts allow ZRC-2 tokens to look like ERC-20 tokens.
 
-Make sure to specify the `zrc2_address` on the deployment file for the ERC20Proxy to be correctly deployed. This allows EVM to execute all desired functions on the ZRC2 as if it were a ERC20. Implementing IERC20 means that all existing DApps and wallets should be compatible with this token.
+Unless you want to build using the `zilliqa-developer` version of `zilliqa-js`, or you encounter missing modules issues while running tests, install our dependencies with:
 
-Make sure to also copy `.env.example` into `.env` and fill in the necessarily variables. Also ensure that `pnpm install` to install any necessary dependencies
+```shell
+pnpm --ignore-workspace i
+```
 
-The following are the deployment commands:
+## Deploying a proxy
 
-- Zilliqa Mainnet
+You can deploy a proxy with:
 
-  ```shell
-  pnpm exec hardhat run scripts/deploy.ts --network zq
-  ```
+```shell
+export PRIVATE_KEY=<...>
+pnpm exec hardhat deployProxy 0x5DD38E64dA8f7d541d8aF45fe00bF37F6a2c6195 --network zq-testnet
+```
 
-- Zilliqa Testnet
+If your ZRC-2 is burnable (ie. supports the `Burn()` transition), you can use:
 
-  ```shell
-  pnpm exec hardhat run scripts/deploy.ts --network zq-testnet
-  ```
+```shell
+export PRIVATE_KEY=<...>
+pnpm exec hardhat deployProxyBurnable 0x5DD38E64dA8f7d541d8aF45fe00bF37F6a2c6195 --network zq-testnet
+```
+
+The task should automatically verify these contracts to sourcify.
+
+## Networks
+
+Various networks are available in the `hardhat.conf.ts`:
+
+- `zq-testnet` - the Zilliqa 1 testnet
+- `zq` - the Zilliqa 1 mainnet
+- `local-proxy` - a local proxy.
+
+You can use the `local-proxy` network and run:
+
+```sh
+mitmweb --mode reverse:https://dev-api.zilliqa.com --no-web-open-browser --listen-port 5556 --web-port 5557
+```
+
+To monitor requests.
+
+## Testing
+
+To run the tests:
+
+```shell
+export PRIVATE_KEY=<...>
+export TEST_KEY_1=<...>
+export TEST_KEY_2=<...>
+pnpm exec hardhat test --network zq-testnet
+```
+
+Each test has a number prefix so you can select them individually.
+
+If you set the `CACHED` environment variable, we will use:
+
+- `CACHED_ZRC2` - address of a ZRC-2
+- `CACHED_ERC20` - address of an ERC-20
+
+To run the tests; this saves you having to redeploy each time.
+
+This allows you to run tests quickly, without waiting for contract
+deployment.