Feature/smc 1796

.eslintrc.js

@@ -32,6 +32,7 @@ module.exports = {
     // "eslint-plugin-react",
     '@typescript-eslint',
   ],
+  ignorePatterns: ['vendor/**', 'node_modules/**', 'dist/**', 'lib/**', 'out/**'],
   rules: {
     '@typescript-eslint/adjacent-overload-signatures': 'error',
     '@typescript-eslint/array-type': [

.gitattributes

@@ -0,0 +1,3 @@
+bridge/contracts/abi/*.json text eol=lf
+loan/contracts/abi/*.json text eol=lf
+shared/contracts/abi/*.json text eol=lf

.github/install-solidity-compiler.sh

@@ -4,6 +4,6 @@
 
 set -euo pipefail
 
-curl -L https://github.com/ethereum/solidity/releases/download/v0.8.29/solc-static-linux > /usr/bin/solc
+curl -L https://github.com/ethereum/solidity/releases/download/v0.8.30/solc-static-linux > /usr/bin/solc
 
 chmod a+x /usr/bin/solc

.github/workflows/bridge-offchain-worker.yml

@@ -163,11 +163,14 @@ jobs:
           cache: 'yarn'
       - run: npm install -g yarn
 
+      - name: Install dependencies
+        run: yarn install --ignore-engines
+
       - name: Setup
         id: setup
+        env:
+          FOUNDRY_VIA_IR: "true"
         run: |
-          yarn install
-
           SOURCE_CHAIN_RPC_URL="${{ steps.env.outputs.source_chain_rpc_url }}"
 
           echo "INFO: generate a new wallet"
@@ -198,7 +201,7 @@ jobs:
                 --broadcast                    \
                 --rpc-url "$SOURCE_CHAIN_RPC_URL"  \
                 --private-key "$WALLET_PK"   \
-                contracts/sol/TestERC20.sol:TestERC20 2>&1)
+                shared/contracts/sol/TestERC20.sol:TestERC20 2>&1)
           echo "$OUTPUT"
           SOURCE_CHAIN_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
           echo "source_chain_contract_address=$SOURCE_CHAIN_CONTRACT_ADDRESS" >> "$GITHUB_OUTPUT"
@@ -208,18 +211,25 @@ jobs:
             --broadcast \
             --rpc-url "$CREDITCOIN_RPC_URL" \
             --private-key "$WALLET_PK" \
-            node_modules/@gluwa/usc-contracts/contracts/decoding/EvmV1Decoder.sol:EvmV1Decoder 2>&1)
+            node_modules/@gluwa/asc-contracts/contracts/common/EvmV1Decoder.sol:EvmV1Decoder 2>&1)
           echo "$OUTPUT"
           DECODER_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
 
           echo "INFO: deploy ASCMinter.sol to Creditcoin chain"
+          set +e
           OUTPUT=$(~/.foundry/bin/forge create \
               --broadcast \
               --rpc-url "$CREDITCOIN_RPC_URL" \
               --private-key "$WALLET_PK" \
-              --libraries "node_modules/@gluwa/usc-contracts/contracts/decoding/EvmV1Decoder.sol:EvmV1Decoder:$DECODER_CONTRACT_ADDRESS" \
-              contracts/sol/ASCMinter.sol:ASCMinter 2>&1)
+              --libraries "node_modules/@gluwa/asc-contracts/contracts/common/EvmV1Decoder.sol:EvmV1Decoder:$DECODER_CONTRACT_ADDRESS" \
+              bridge/contracts/sol/ASCMinter.sol:ASCMinter 2>&1)
+          STATUS=$?
+          set -e
           echo "$OUTPUT"
+          if [ "$STATUS" -ne 0 ]; then
+            echo "ERROR: ASCMinter forge create failed (exit $STATUS)"
+            exit "$STATUS"
+          fi
           ASC_MINTER_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
           echo "asc_minter_contract_address=$ASC_MINTER_CONTRACT_ADDRESS" >> "$GITHUB_OUTPUT"
 
@@ -228,7 +238,7 @@ jobs:
               --broadcast \
               --rpc-url "$CREDITCOIN_RPC_URL" \
               --private-key "$WALLET_PK" \
-              contracts/sol/BridgeTestToken.sol:BridgeTestToken \
+              bridge/contracts/sol/BridgeTestToken.sol:BridgeTestToken \
               --constructor-args "$ASC_MINTER_CONTRACT_ADDRESS" 2>&1)
           echo "$OUTPUT"
           ASC_MINTABLE_TOKEN=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")

.github/workflows/custom-contracts-bridging.yml

@@ -163,11 +163,14 @@ jobs:
           cache: 'yarn'
       - run: npm install -g yarn
 
+      - name: Install dependencies
+        run: yarn install --ignore-engines
+
       - name: Setup
         id: setup
+        env:
+          FOUNDRY_VIA_IR: "true"
         run: |
-          yarn install
-
           SOURCE_CHAIN_RPC_URL="${{ steps.env.outputs.source_chain_rpc_url }}"
 
           echo "INFO: generate a new wallet"
@@ -198,7 +201,7 @@ jobs:
                 --broadcast                    \
                 --rpc-url "$SOURCE_CHAIN_RPC_URL"  \
                 --private-key "$WALLET_PK"   \
-                contracts/sol/TestERC20.sol:TestERC20 2>&1)
+                shared/contracts/sol/TestERC20.sol:TestERC20 2>&1)
           echo "$OUTPUT"
           SOURCE_CHAIN_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
           echo "source_chain_contract_address=$SOURCE_CHAIN_CONTRACT_ADDRESS" >> "$GITHUB_OUTPUT"
@@ -208,22 +211,29 @@ jobs:
             --broadcast \
             --rpc-url "$CREDITCOIN_RPC_URL" \
             --private-key "$WALLET_PK" \
-            node_modules/@gluwa/usc-contracts/contracts/decoding/EvmV1Decoder.sol:EvmV1Decoder 2>&1)
+            node_modules/@gluwa/asc-contracts/contracts/common/EvmV1Decoder.sol:EvmV1Decoder 2>&1)
           echo "$OUTPUT"
           DECODER_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
 
           echo "INFO: Modify ASCMinter.sol to mint 2x"
-          sed -i "s/ASCMintableToken(wrappedTokenAddress).mint(burntFrom, burntValue);/ASCMintableToken(wrappedTokenAddress).mint(burntFrom, burntValue * 2);/" contracts/sol/ASCMinter.sol
+          sed -i "s/ASCMintableToken(wrappedTokenAddress).mint(burntFrom, burntValue);/ASCMintableToken(wrappedTokenAddress).mint(burntFrom, burntValue * 2);/" bridge/contracts/sol/ASCMinter.sol
           git diff
 
           echo "INFO: deploy ASCMinter.sol to Creditcoin chain"
+          set +e
           OUTPUT=$(~/.foundry/bin/forge create \
               --broadcast \
               --rpc-url "$CREDITCOIN_RPC_URL" \
               --private-key "$WALLET_PK" \
-              --libraries "node_modules/@gluwa/usc-contracts/contracts/decoding/EvmV1Decoder.sol:EvmV1Decoder:$DECODER_CONTRACT_ADDRESS" \
-              contracts/sol/ASCMinter.sol:ASCMinter 2>&1)
+              --libraries "node_modules/@gluwa/asc-contracts/contracts/common/EvmV1Decoder.sol:EvmV1Decoder:$DECODER_CONTRACT_ADDRESS" \
+              bridge/contracts/sol/ASCMinter.sol:ASCMinter 2>&1)
+          STATUS=$?
+          set -e
           echo "$OUTPUT"
+          if [ "$STATUS" -ne 0 ]; then
+            echo "ERROR: ASCMinter forge create failed (exit $STATUS)"
+            exit "$STATUS"
+          fi
           ASC_MINTER_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
           echo "asc_minter_contract_address=$ASC_MINTER_CONTRACT_ADDRESS" >> "$GITHUB_OUTPUT"
 
@@ -232,7 +242,7 @@ jobs:
               --broadcast \
               --rpc-url "$CREDITCOIN_RPC_URL" \
               --private-key "$WALLET_PK" \
-              contracts/sol/BridgeTestToken.sol:BridgeTestToken \
+              bridge/contracts/sol/BridgeTestToken.sol:BridgeTestToken \
               --constructor-args "$ASC_MINTER_CONTRACT_ADDRESS" 2>&1)
           echo "$OUTPUT"
           ASC_MINTABLE_TOKEN=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")

.github/workflows/examples-devnet.yml

@@ -43,9 +43,7 @@ jobs:
     secrets: inherit
 
   loan-flow:
-    if: false
-    # chain examples b/c they use the same wallet and we get
-    # replacement transaction underpriced and/or nonce errors
+    # Run after other devnet examples (shared wallet) to avoid nonce collisions.
     needs: bridge-offchain-worker
     uses: ./.github/workflows/loan-flow.yml
     with:

.github/workflows/examples.yml

@@ -25,24 +25,28 @@ jobs:
     with:
       source_chain_kind: "anvil"
       asc_kind: "local"
+    secrets: inherit
 
   custom-contracts-bridging:
     needs: build
     uses: ./.github/workflows/custom-contracts-bridging.yml
     with:
       source_chain_kind: "anvil"
       asc_kind: "local"
+    secrets: inherit
 
   bridge-offchain-worker:
     needs: build
     uses: ./.github/workflows/bridge-offchain-worker.yml
     with:
       source_chain_kind: "anvil"
       asc_kind: "local"
+    secrets: inherit
 
   loan-flow:
     needs: build
     uses: ./.github/workflows/loan-flow.yml
     with:
       source_chain_kind: "anvil"
       asc_kind: "local"
+    secrets: inherit

.github/workflows/hello-bridge.yml

@@ -163,11 +163,15 @@ jobs:
           cache: 'yarn'
       - run: npm install -g yarn
 
+      - name: Install dependencies
+        run: yarn install --ignore-engines
+
       - name: Setup
         id: setup
+        env:
+          # ASCMinter + package ASCBase need via-IR (stack too deep otherwise).
+          FOUNDRY_VIA_IR: "true"
         run: |
-          yarn install
-
           SOURCE_CHAIN_RPC_URL="${{ steps.env.outputs.source_chain_rpc_url }}"
 
           echo "INFO: generate a new wallet"
@@ -198,7 +202,7 @@ jobs:
                 --broadcast                    \
                 --rpc-url "$SOURCE_CHAIN_RPC_URL"  \
                 --private-key ${{ steps.env.outputs.source_chain_private_key }}   \
-                contracts/sol/TestERC20.sol:TestERC20 2>&1)
+                shared/contracts/sol/TestERC20.sol:TestERC20 2>&1)
           echo "$OUTPUT"
           SOURCE_CHAIN_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
           echo "source_chain_contract_address=$SOURCE_CHAIN_CONTRACT_ADDRESS" >> "$GITHUB_OUTPUT"
@@ -208,18 +212,25 @@ jobs:
             --broadcast \
             --rpc-url "$CREDITCOIN_RPC_URL" \
             --private-key ${{ steps.env.outputs.execution_chain_private_key }} \
-            node_modules/@gluwa/usc-contracts/contracts/decoding/EvmV1Decoder.sol:EvmV1Decoder 2>&1)
+            node_modules/@gluwa/asc-contracts/contracts/common/EvmV1Decoder.sol:EvmV1Decoder 2>&1)
           echo "$OUTPUT"
           DECODER_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
 
           echo "INFO: deploy ASCMinter.sol to Creditcoin chain"
+          set +e
           OUTPUT=$(~/.foundry/bin/forge create \
               --broadcast \
               --rpc-url "$CREDITCOIN_RPC_URL" \
               --private-key ${{ steps.env.outputs.execution_chain_private_key }} \
-              --libraries "node_modules/@gluwa/usc-contracts/contracts/decoding/EvmV1Decoder.sol:EvmV1Decoder:$DECODER_CONTRACT_ADDRESS" \
-              contracts/sol/ASCMinter.sol:ASCMinter 2>&1)
+              --libraries "node_modules/@gluwa/asc-contracts/contracts/common/EvmV1Decoder.sol:EvmV1Decoder:$DECODER_CONTRACT_ADDRESS" \
+              bridge/contracts/sol/ASCMinter.sol:ASCMinter 2>&1)
+          STATUS=$?
+          set -e
           echo "$OUTPUT"
+          if [ "$STATUS" -ne 0 ]; then
+            echo "ERROR: ASCMinter forge create failed (exit $STATUS)"
+            exit "$STATUS"
+          fi
           ASC_MINTER_CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")
           echo "minter_contract_address=$ASC_MINTER_CONTRACT_ADDRESS" >> "$GITHUB_OUTPUT"
 
@@ -228,7 +239,7 @@ jobs:
               --broadcast \
               --rpc-url "$CREDITCOIN_RPC_URL" \
               --private-key "$WALLET_PK" \
-              contracts/sol/BridgeTestToken.sol:BridgeTestToken \
+              bridge/contracts/sol/BridgeTestToken.sol:BridgeTestToken \
               --constructor-args "$ASC_MINTER_CONTRACT_ADDRESS" 2>&1)
           echo "$OUTPUT"
           ASC_MINTABLE_TOKEN=$(echo "$OUTPUT" | grep "Deployed to:" | cut -f2 -d: | tr -d " ")

.github/workflows/javascript-checks.yaml

@@ -40,13 +40,11 @@ jobs:
 
           echo "$HOME/.foundry/bin" >> "$GITHUB_PATH"
 
+      - name: Install forge-std
+        run: git clone --depth 1 https://github.com/foundry-rs/forge-std lib/forge-std
+
       - name: Install dependencies
-        run: |
-          if [ -f yarn.lock ]; then
-              yarn install
-          else
-              npm clean-install
-          fi
+        run: yarn install --ignore-engines
 
       - name: Execute command ${{ matrix.command }}
         run: |